Skip to content

Commit

Permalink
Update the used Ubuntu version to from 20.04 to 22.04 in the workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrunner committed Jul 18, 2023
1 parent a001c8e commit 4102c2f
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 19 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/audit.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Audit

on:
Expand All @@ -7,7 +6,7 @@ on:

jobs:
audit:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: Audit
timeout-minutes: 10

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-review.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
auto-merge:
name: Auto reviews updates
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 5

steps:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/backport.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Backport

on:
Expand All @@ -9,7 +8,7 @@ on:

jobs:
backport:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: Backport
timeout-minutes: 5

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/clean.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
---
name: Clean docker hub tags

on: delete

jobs:
clean:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: Clean docker hub tags
timeout-minutes: 5

Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
---
name: Continuous integration

on:
push:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 30
name: Continuous integration
if: "!startsWith(github.event.head_commit.message, '[skip ci] ')"
Expand Down Expand Up @@ -52,7 +51,9 @@ jobs:
if: "!startsWith(github.ref, 'refs/tags/')"
- run: sed --in-place 's/version = .*/version = "${{ steps.last-tag.outputs.tag }}"/g' build.gradle
if: "!startsWith(github.ref, 'refs/tags/') && steps.no-tag.outputs.nb == 0"
- run: sed --in-place 's/version = .*/version = "${{ steps.last-tag.outputs.tag }}+${{ steps.no-tag.outputs.nb }}"/g' build.gradle
- run:
sed --in-place 's/version = .*/version = "${{ steps.last-tag.outputs.tag }}+${{ steps.no-tag.outputs.nb
}}"/g' build.gradle
if: "!startsWith(github.ref, 'refs/tags/') && steps.no-tag.outputs.nb > 0"

- run: echo "enablePublishing=true" > gradle.properties
Expand Down Expand Up @@ -82,8 +83,7 @@ jobs:

- run: make acceptance-tests-down

- run: mkdir -p core/build/resources/actual examples/build/reports core/build/reports
examples/build/resources/test/examples
- run: mkdir -p core/build/resources/actual examples/build/reports core/build/reports examples/build/resources/test/examples
if: always()
- uses: actions/upload-artifact@v1
with:
Expand Down Expand Up @@ -131,7 +131,9 @@ jobs:
run: c2cciutils-publish
if: env.SECRETS == 'TRUE'
- run: git diff
- run: docker run --rm --env=GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} mapfish_print_builder bash -c 'gradle build && gradle publish'
- run:
docker run --rm --env=GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} mapfish_print_builder bash -c 'gradle
build && gradle publish'
if: ( startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' ) && env.SECRETS == 'TRUE'

- id: version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
build:
name: Pull request check
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 5

steps:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/rebuild-3-20-3-22.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Rebuild 3.20 - 3.22

on:
Expand All @@ -7,7 +6,7 @@ on:

jobs:
rebuild:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 20
name: Rebuild 3.20 - 3.22

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rebuild-3-23.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
rebuild:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 20
name: Rebuild 3.23

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/rebuild.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Rebuild

on:
Expand All @@ -7,7 +6,7 @@ on:

jobs:
rebuild:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 30
name: Rebuild

Expand Down

0 comments on commit 4102c2f

Please sign in to comment.