From dc013e9972122b153f9ae0449ddc663c3c137203 Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Wed, 27 Nov 2024 18:30:16 +0100 Subject: [PATCH 1/3] CI: update checkout and setup-node actions to latest This just keeps us up to date and avoids warnings for deprecated Node.js versions in CI. --- .github/workflows/_integration_tests.yml | 2 +- .github/workflows/_unit_tests.yml | 2 +- .github/workflows/push.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/_integration_tests.yml b/.github/workflows/_integration_tests.yml index 6bf7d256..1a7905dc 100644 --- a/.github/workflows/_integration_tests.yml +++ b/.github/workflows/_integration_tests.yml @@ -11,7 +11,7 @@ jobs: 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: diff --git a/.github/workflows/_unit_tests.yml b/.github/workflows/_unit_tests.yml index d1aa5787..d89d90bc 100644 --- a/.github/workflows/_unit_tests.yml +++ b/.github/workflows/_unit_tests.yml @@ -9,7 +9,7 @@ jobs: - ${{ vars.UBUNTU_VERSION }} 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: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index dd9c983e..b7c3cc40 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -13,7 +13,7 @@ jobs: if: github.ref == 'refs/heads/master' && github.event_name == 'push' runs-on: ${{ vars.UBUNTU_VERSION }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install Node.js uses: actions/setup-node@v4 with: @@ -31,7 +31,7 @@ jobs: needs: [unit-tests, integration-tests, npm-publish] runs-on: ${{ vars.UBUNTU_VERSION }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build Docker images env: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} From f17fd712fbaa6f00c83f4bfa882fbc69ae34935e Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Wed, 27 Nov 2024 18:30:16 +0100 Subject: [PATCH 2/3] CI: move away from an Ubuntu version variable in GH Actions This doesn't really save us much effort and breaks CI on forks. Connects https://github.com/pelias/pelias/issues/951 --- .github/workflows/_integration_tests.yml | 2 +- .github/workflows/_unit_tests.yml | 2 +- .github/workflows/push.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/_integration_tests.yml b/.github/workflows/_integration_tests.yml index 1a7905dc..cffd0edb 100644 --- a/.github/workflows/_integration_tests.yml +++ b/.github/workflows/_integration_tests.yml @@ -6,7 +6,7 @@ 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] diff --git a/.github/workflows/_unit_tests.yml b/.github/workflows/_unit_tests.yml index d89d90bc..b371970f 100644 --- a/.github/workflows/_unit_tests.yml +++ b/.github/workflows/_unit_tests.yml @@ -6,7 +6,7 @@ jobs: strategy: matrix: os: - - ${{ vars.UBUNTU_VERSION }} + - ubuntu-22.04 node-version: [18.x, 20.x, 22.x] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index b7c3cc40..a8df7609 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -11,7 +11,7 @@ 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@v4 - name: Install Node.js @@ -29,7 +29,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, integration-tests, npm-publish] - runs-on: ${{ vars.UBUNTU_VERSION }} + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Build Docker images From 75c95bae7318ac2411706dd8c3dbcced46298eea Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Wed, 27 Nov 2024 18:30:17 +0100 Subject: [PATCH 3/3] feat(docker): Upgrade to Node.js 18 Docker baseimage BREAKING CHANGE: The Docker baseimage has been updated to use Node.js 18.20.5, so this repository's Docker image will also use it. https://github.com/pelias/pelias/issues/950