Skip to content

Commit

Permalink
Update ubuntu versions in CI workflows (#1759)
Browse files Browse the repository at this point in the history
* update workflows to use ubuntu-latest

* use setup-scala instead of java to ensure sbt is installed

* Add .tool-versions file used by setup-scala action

* use ubuntu 22.04 for failing client tests
  • Loading branch information
Georges-GNM authored Feb 13, 2025
1 parent 80c6c9d commit 18dc202
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 25 deletions.
38 changes: 13 additions & 25 deletions .github/workflows/improvedci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
generate_build_number:
name: Generate build number
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
outputs:
BUILD_NUMBER: ${{ steps.create-build-number.outputs.BUILD_NUMBER }}
steps:
Expand All @@ -19,7 +19,7 @@ jobs:
echo "BUILD_NUMBER=$(( $GITHUB_RUN_NUMBER + $LAST_TEAMCITY_BUILD ))" >> "$GITHUB_OUTPUT"
build_client_v1:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
permissions:
id-token: write
contents: read
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
path: public/src/jspm_packages
if-no-files-found: error
test_client_v1:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
permissions:
id-token: write
contents: read
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
grunt --stack test
build_client_v2:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
permissions:
id-token: write
contents: read
Expand All @@ -112,7 +112,7 @@ jobs:
path: public/fronts-client-v2
if-no-files-found: error
test_client_v2:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
permissions:
id-token: write
contents: read
Expand All @@ -129,7 +129,7 @@ jobs:
working-directory: fronts-client

integrationtest_client_v2:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
permissions:
id-token: write
contents: read
Expand All @@ -152,7 +152,7 @@ jobs:
working-directory: fronts-client

test_backend:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
permissions:
id-token: write
contents: read
Expand All @@ -174,28 +174,20 @@ jobs:
- 4724:5432
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: "11"
distribution: "corretto"
cache: "sbt"
- uses: guardian/setup-scala@v1
- name: Run tests
run: sbt 'test; database-int:test'

lint_backend:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: "11"
distribution: "corretto"
cache: "sbt"
- uses: guardian/setup-scala@v1
- name: Check scala formatting
run: sbt 'scalafmtCheck; scalafmtSbtCheck;'

build_backend:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
permissions:
id-token: write
contents: read
Expand All @@ -220,11 +212,7 @@ jobs:
- name: Set GITHUB_RUN_NUMBER environment variable
run: |
echo "GITHUB_RUN_NUMBER=${{ needs.generate_build_number.outputs.BUILD_NUMBER }}" >> $GITHUB_ENV
- uses: actions/setup-java@v4
with:
java-version: "11"
distribution: "corretto"
cache: "sbt"
- uses: guardian/setup-scala@v1
- name: Bundle
run: sbt debian:packageBin
- uses: actions/upload-artifact@v4
Expand All @@ -234,7 +222,7 @@ jobs:
if-no-files-found: error
compression-level: '0' #no point, it's already compressed
upload:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
permissions:
id-token: write
contents: read
Expand Down
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java corretto-11.0.25.9.1

0 comments on commit 18dc202

Please sign in to comment.