Merge branch 'bump-os' into 'master'

Bump builder OS's See merge request mkjeldsen/commitmsgfmt!39
commonquail · Sep 21, 2023 · b7ee2b3 · b7ee2b3
2 parents b883000 + f8f2e01
commit b7ee2b3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,23 +21,23 @@ jobs:
           - macos
         include:
           - build: pinned
-            os: ubuntu-18.04
+            os: ubuntu-22.04
             rust: 1.48.0
 
           - build: stable
-            os: ubuntu-18.04
+            os: ubuntu-22.04
             rust: stable
 
           - build: nightly
-            os: ubuntu-18.04
+            os: ubuntu-22.04
             rust: nightly
 
           - build: win-msvc
-            os: windows-2019
+            os: windows-2022
             rust: nightly
 
           - build: macos
-            os: macos-latest
+            os: macos-12
             rust: nightly
     env:
       # Backtraces for panics.

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -44,17 +44,17 @@ jobs:
           - win-msvc
         include:
           - build: linux
-            os: ubuntu-18.04
+            os: ubuntu-22.04
             target: x86_64-unknown-linux-musl
             binary_ext:
 
           - build: macos
-            os: macos-latest
+            os: macos-12
             target: x86_64-apple-darwin
             binary_ext:
 
           - build: win-msvc
-            os: windows-2019
+            os: windows-2022
             target: x86_64-pc-windows-msvc
             binary_ext: .exe
     env:
@@ -80,18 +80,18 @@ jobs:
       #   run: ./ci/install-${{ matrix.os }}
       # but I couldn't get Windows to do anything that way.
       - name: Install dependencies (Ubuntu)
-        if: matrix.os == 'ubuntu-18.04'
+        if: matrix.os == 'ubuntu-22.04'
         run: |
           sudo apt-get update
           sudo apt-get install --yes --no-install-recommends \
             asciidoctor
 
       - name: Install dependencies (Windows)
-        if: matrix.os == 'windows-2019'
+        if: matrix.os == 'windows-2022'
         run: gem install asciidoctor
 
       - name: Install dependencies (macOS)
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-12'
         run: brew install asciidoctor
 
       - name: Install Rust
@@ -127,7 +127,7 @@ jobs:
           cp -r contrib "$package"
           cp "${{ env.RELEASE_BINARY }}" "$package"
 
-          if [[ "${{ matrix.os }}" = 'windows-2019' ]]
+          if [[ "${{ matrix.os }}" = 'windows-2022' ]]
           then
             7z a "$package.zip" "$package"
             printf 'ASSET=%s\n' "$package.zip" >> $GITHUB_ENV