Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 50 additions & 50 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,55 +43,55 @@ jobs:
# github-token: ${{ secrets.GITHUB_TOKEN }}
# env:
# CI: true
e2eTest:
name: (develop) E2E - Checkout infrastructure, install mocha and run tests (docker-compose up, mocha tests and docker-compose down)
needs: buildTest
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
steps:
- uses: actions/checkout@v2
with:
repository: governify/bluejay-infrastructure
ref: refs/heads/develop
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
run: npm ci
- name: Add host.docker.internal association to 172.17.0.1
run: sudo echo "172.17.0.1 host.docker.internal" | sudo tee -a /etc/hosts
- name: Run tests
run: npm run test
env:
CI: true
e2eMain:
name: (main) E2E - Checkout infrastructure, install mocha and run tests (docker-compose up, mocha tests and docker-compose down)
if: ${{ github.ref == 'refs/heads/main' }}
needs: test
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
steps:
- uses: actions/checkout@v2
with:
repository: governify/bluejay-infrastructure
ref: refs/heads/develop
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
run: npm ci
- name: Add host.docker.internal association to 172.17.0.1
run: sudo echo "172.17.0.1 host.docker.internal" | sudo tee -a /etc/hosts
- name: Run tests
run: npm run test
env:
CI: true
# e2eTest:
# name: (develop) E2E - Checkout infrastructure, install mocha and run tests (docker-compose up, mocha tests and docker-compose down)
# needs: buildTest
# runs-on: ubuntu-latest
# strategy:
# matrix:
# node-version: [14.x]
# steps:
# - uses: actions/checkout@v2
# with:
# repository: governify/bluejay-infrastructure
# ref: refs/heads/develop
# - name: Use Node.js ${{ matrix.node-version }}
# uses: actions/setup-node@v1
# with:
# node-version: ${{ matrix.node-version }}
# - name: Install dependencies
# run: npm ci
# - name: Add host.docker.internal association to 172.17.0.1
# run: sudo echo "172.17.0.1 host.docker.internal" | sudo tee -a /etc/hosts
# - name: Run tests
# run: npm run test
# env:
# CI: true
# e2eMain:
# name: (main) E2E - Checkout infrastructure, install mocha and run tests (docker-compose up, mocha tests and docker-compose down)
# if: ${{ github.ref == 'refs/heads/main' }}
# needs: test
# runs-on: ubuntu-latest
# strategy:
# matrix:
# node-version: [14.x]
# steps:
# - uses: actions/checkout@v2
# with:
# repository: governify/bluejay-infrastructure
# ref: refs/heads/develop
# - name: Use Node.js ${{ matrix.node-version }}
# uses: actions/setup-node@v1
# with:
# node-version: ${{ matrix.node-version }}
# - name: Install dependencies
# run: npm ci
# - name: Add host.docker.internal association to 172.17.0.1
# run: sudo echo "172.17.0.1 host.docker.internal" | sudo tee -a /etc/hosts
# - name: Run tests
# run: npm run test
# env:
# CI: true
buildTest:
name: Build and push to dockerhub using develop tag
if: ${{ github.ref == 'refs/heads/develop' && github.event_name == 'push' }}
Expand All @@ -118,7 +118,7 @@ jobs:
buildProdAndRelease:
name: Release, build and push to dockerhub using tag version
if: ${{ github.ref == 'refs/heads/main' && github.event_name == 'push'}}
needs: e2eMain
needs: test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down