Skip to content

Commit 164625b

Browse files
committed
Merge branch 'ci-bump-gh-runners' into 'master'
ci: bump GitHub runners See merge request mkjeldsen/commitmsgfmt!87
2 parents ee953b0 + 3631eb9 commit 164625b

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
@@ -24,23 +24,23 @@ jobs:
2424
- macos
2525
include:
2626
- build: msrv
27-
os: ubuntu-22.04
27+
os: ubuntu-24.04
2828
rust: 1.63.0
2929

3030
- build: stable
31-
os: ubuntu-22.04
31+
os: ubuntu-24.04
3232
rust: stable
3333

3434
- build: nightly
35-
os: ubuntu-22.04
35+
os: ubuntu-24.04
3636
rust: nightly
3737

3838
- build: win-msvc
39-
os: windows-2022
39+
os: windows-2025
4040
rust: nightly
4141

4242
- build: macos
43-
os: macos-12
43+
os: macos-15
4444
rust: nightly
4545
env:
4646
# Backtraces for panics.

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
archive-src:
1414
name: archive-src
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-24.04
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v4
@@ -56,17 +56,17 @@ jobs:
5656
- win-msvc
5757
include:
5858
- build: linux
59-
os: ubuntu-22.04
59+
os: ubuntu-24.04
6060
target: x86_64-unknown-linux-musl
6161
binary_ext:
6262

6363
- build: macos
64-
os: macos-12
64+
os: macos-15
6565
target: x86_64-apple-darwin
6666
binary_ext:
6767

6868
- build: win-msvc
69-
os: windows-2022
69+
os: windows-2025
7070
target: x86_64-pc-windows-msvc
7171
binary_ext: .exe
7272
env:
@@ -93,18 +93,18 @@ jobs:
9393
# run: ./ci/install-${{ matrix.os }}
9494
# but I couldn't get Windows to do anything that way.
9595
- name: Install dependencies (Ubuntu)
96-
if: matrix.os == 'ubuntu-22.04'
96+
if: matrix.os == 'ubuntu-24.04'
9797
run: |
9898
sudo apt-get update
9999
sudo apt-get install --yes --no-install-recommends \
100100
asciidoctor
101101
102102
- name: Install dependencies (Windows)
103-
if: matrix.os == 'windows-2022'
103+
if: matrix.os == 'windows-2025'
104104
run: gem install asciidoctor
105105

106106
- name: Install dependencies (macOS)
107-
if: matrix.os == 'macos-12'
107+
if: matrix.os == 'macos-15'
108108
run: brew install asciidoctor
109109

110110
- name: Install Rust

0 commit comments

Comments
 (0)