Skip to content

Commit b7ee2b3

Browse files
committed
Merge branch 'bump-os' into 'master'
Bump builder OS's See merge request mkjeldsen/commitmsgfmt!39
2 parents b883000 + f8f2e01 commit b7ee2b3

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ jobs:
2121
- macos
2222
include:
2323
- build: pinned
24-
os: ubuntu-18.04
24+
os: ubuntu-22.04
2525
rust: 1.48.0
2626

2727
- build: stable
28-
os: ubuntu-18.04
28+
os: ubuntu-22.04
2929
rust: stable
3030

3131
- build: nightly
32-
os: ubuntu-18.04
32+
os: ubuntu-22.04
3333
rust: nightly
3434

3535
- build: win-msvc
36-
os: windows-2019
36+
os: windows-2022
3737
rust: nightly
3838

3939
- build: macos
40-
os: macos-latest
40+
os: macos-12
4141
rust: nightly
4242
env:
4343
# Backtraces for panics.

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ jobs:
4444
- win-msvc
4545
include:
4646
- build: linux
47-
os: ubuntu-18.04
47+
os: ubuntu-22.04
4848
target: x86_64-unknown-linux-musl
4949
binary_ext:
5050

5151
- build: macos
52-
os: macos-latest
52+
os: macos-12
5353
target: x86_64-apple-darwin
5454
binary_ext:
5555

5656
- build: win-msvc
57-
os: windows-2019
57+
os: windows-2022
5858
target: x86_64-pc-windows-msvc
5959
binary_ext: .exe
6060
env:
@@ -80,18 +80,18 @@ jobs:
8080
# run: ./ci/install-${{ matrix.os }}
8181
# but I couldn't get Windows to do anything that way.
8282
- name: Install dependencies (Ubuntu)
83-
if: matrix.os == 'ubuntu-18.04'
83+
if: matrix.os == 'ubuntu-22.04'
8484
run: |
8585
sudo apt-get update
8686
sudo apt-get install --yes --no-install-recommends \
8787
asciidoctor
8888
8989
- name: Install dependencies (Windows)
90-
if: matrix.os == 'windows-2019'
90+
if: matrix.os == 'windows-2022'
9191
run: gem install asciidoctor
9292

9393
- name: Install dependencies (macOS)
94-
if: matrix.os == 'macos-latest'
94+
if: matrix.os == 'macos-12'
9595
run: brew install asciidoctor
9696

9797
- name: Install Rust
@@ -127,7 +127,7 @@ jobs:
127127
cp -r contrib "$package"
128128
cp "${{ env.RELEASE_BINARY }}" "$package"
129129
130-
if [[ "${{ matrix.os }}" = 'windows-2019' ]]
130+
if [[ "${{ matrix.os }}" = 'windows-2022' ]]
131131
then
132132
7z a "$package.zip" "$package"
133133
printf 'ASSET=%s\n' "$package.zip" >> $GITHUB_ENV

0 commit comments

Comments
 (0)