Skip to content

Commit

Permalink
ci: bump Ubuntu version to 22.04
Browse files Browse the repository at this point in the history
  • Loading branch information
eduardosm committed Apr 21, 2024
1 parent 346f7ca commit 330a406
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 17 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
# 'always()' is needed because GitHub treats a skipped job (due to a failed
# dependency) a success.
if: always()
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Report status
env:
Expand All @@ -27,14 +27,14 @@ jobs:
run: jq --exit-status 'all(.result == "success")' <<< "$NEEDS_JSON"

lint-aux:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Run job
run: ./ci/lint-aux.sh

extract-changelog:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Run job
Expand All @@ -47,21 +47,21 @@ jobs:
if-no-files-found: error

rustfmt:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Run job
run: ./ci/rustfmt.sh

clippy:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Run job
run: ./ci/clippy.sh

build-and-test:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand All @@ -73,7 +73,7 @@ jobs:
run: ./ci/build-and-test.sh "${{ matrix.rust-version }}"

package-crate:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Run job
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
get-version:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
outputs:
version: ${{ steps.get-version.outputs.version }}
steps:
Expand All @@ -16,7 +16,7 @@ jobs:
run: ./ci/get-release-version.sh

get-ci-artifacts:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Download artifacts
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
- get-ci-artifacts
permissions:
contents: write
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Download version-changelog artifact
Expand All @@ -68,7 +68,7 @@ jobs:
publish-crate:
needs: create-gh-release
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Publish
Expand Down
2 changes: 1 addition & 1 deletion ci/build-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ rust_version="$1"

begin_group "Install Rust"
./ci/install-rust.sh "$rust_version" --profile minimal
# shellcheck disable=SC1090
# shellcheck disable=SC1091
. "$HOME/.cargo/env"
end_group

Expand Down
2 changes: 1 addition & 1 deletion ci/clippy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euo pipefail

begin_group "Install Rust"
./ci/install-rust.sh stable.txt --profile minimal -c clippy
# shellcheck disable=SC1090
# shellcheck disable=SC1091
. "$HOME/.cargo/env"
end_group

Expand Down
2 changes: 1 addition & 1 deletion ci/get-release-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euo pipefail

begin_group "Install Rust"
./ci/install-rust.sh stable.txt --profile minimal -c clippy
# shellcheck disable=SC1090
# shellcheck disable=SC1091
. "$HOME/.cargo/env"
end_group

Expand Down
2 changes: 1 addition & 1 deletion ci/package-crate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euo pipefail

begin_group "Install Rust"
./ci/install-rust.sh stable.txt --profile minimal
# shellcheck disable=SC1090
# shellcheck disable=SC1091
. "$HOME/.cargo/env"
end_group

Expand Down
2 changes: 1 addition & 1 deletion ci/publish-crate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euo pipefail

begin_group "Install Rust"
./ci/install-rust.sh stable.txt --profile minimal -c clippy
# shellcheck disable=SC1090
# shellcheck disable=SC1091
. "$HOME/.cargo/env"
end_group

Expand Down
2 changes: 1 addition & 1 deletion ci/rustfmt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euo pipefail

begin_group "Install Rust"
./ci/install-rust.sh stable.txt --profile minimal -c rustfmt
# shellcheck disable=SC1090
# shellcheck disable=SC1091
. "$HOME/.cargo/env"
end_group

Expand Down
1 change: 1 addition & 0 deletions ci/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ begin_group() {
echo "::group::$1"
}

# shellcheck disable=SC2120
end_group() {
if [ $# -ne 0 ]; then
echo_stderr "Invalid use of $0"
Expand Down

0 comments on commit 330a406

Please sign in to comment.