diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml index 1d647a2..6efcedc 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -6,18 +6,16 @@ jobs: strategy: matrix: os: - - ${{ vars.UBUNTU_VERSION }} - node-version: - - 12.x - - 14.x - - 16.x + - ubuntu-22.04 + node-version: [ 18.x, 20.x, 22.x ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: 'Install node.js ${{ matrix.node-version }}' - uses: actions/setup-node@v2-beta + uses: actions/setup-node@v4 with: 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 6c8fc07..bc0d0e8 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -6,13 +6,13 @@ 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@v2 + - uses: actions/checkout@v4 - name: Install Node.js - uses: actions/setup-node@v2-beta + uses: actions/setup-node@v4 with: - node-version: 16.x + node-version: 20.x - name: Run semantic-release env: GH_TOKEN: ${{ secrets.GH_SEMANTIC_RELEASE_TOKEN }} @@ -21,17 +21,3 @@ jobs: if [[ -n "$GH_TOKEN" && -n "$NPM_TOKEN" ]]; then curl "https://raw.githubusercontent.com/pelias/ci-tools/master/semantic-release.sh" | bash - fi - build-docker-images: - # run this job if the unit tests passed and the npm-publish job was a success or was skipped - # 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 }} - steps: - - uses: actions/checkout@v2 - - name: Build Docker images - env: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - run: | - curl "https://raw.githubusercontent.com/pelias/ci-tools/master/build-docker-images.sh" | bash -