Skip to content

Commit

Permalink
Merge pull request #500 from pelias/nodejs-18-and-ci-updates
Browse files Browse the repository at this point in the history
Update Ubuntu and other Github Action versions in CI
  • Loading branch information
orangejulius authored Dec 3, 2024
2 parents 0b6f8cc + 75c95ba commit 41bd2d1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ jobs:
strategy:
matrix:
os:
- ${{ vars.UBUNTU_VERSION }}
- ubuntu-22.04
node-version: [18.x, 20.x, 22.x]
es-version: [7.6.1]
jdk-version: [oraclejdk11]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ jobs:
strategy:
matrix:
os:
- ${{ vars.UBUNTU_VERSION }}
- 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@v4
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
npm-publish:
needs: [unit-tests, integration-tests]
if: github.ref == 'refs/heads/master' && github.event_name == 'push'
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@v4
with:
Expand All @@ -29,9 +29,9 @@ 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, integration-tests, npm-publish]
runs-on: ${{ vars.UBUNTU_VERSION }}
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Build Docker images
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
Expand Down

0 comments on commit 41bd2d1

Please sign in to comment.