diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml index 6cc146b28..6efcedce5 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -6,12 +6,8 @@ jobs: strategy: matrix: os: - - ${{ vars.UBUNTU_VERSION }} - node-version: - - 16.x - - 18.x - - 20.x - - 22.x + - ubuntu-22.04 + node-version: [ 18.x, 20.x, 22.x ] steps: - uses: actions/checkout@v4 - name: 'Install node.js ${{ matrix.node-version }}' @@ -20,5 +16,6 @@ jobs: node-version: '${{ matrix.node-version }}' - name: Run unit tests run: | + [[ -f ./bin/ci-setup ]] && ./bin/ci-setup npm install npm run ci diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 558d5df8f..8c1f92953 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -6,7 +6,7 @@ jobs: npm-publish: needs: unit-tests if: github.ref == 'refs/heads/master' && needs.unit-tests.result == 'success' - runs-on: ${{ vars.UBUNTU_VERSION }} + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Install Node.js @@ -26,7 +26,7 @@ jobs: # note: github actions won't run a job if you don't call one of the status check functions, so `always()` is called since it evalutes to `true` if: ${{ always() && needs.unit-tests.result == 'success' && (needs.npm-publish.result == 'success' || needs.npm-publish.result == 'skipped') }} needs: [unit-tests, npm-publish] - runs-on: ${{ vars.UBUNTU_VERSION }} + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Build Docker images