summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gallant <jamslam@gmail.com>2023-07-09 09:41:39 -0400
committerAndrew Gallant <jamslam@gmail.com>2023-07-09 10:14:03 -0400
commitefb2e8ce1e1277fbfa37329b6663c8cf86d6951a (patch)
tree0bff3a5f0dbce895ec997a7d67da37cc8bcdec59
parent8d464e5c78510502cd1cf1d205c82df5de183825 (diff)
ci/release: use latest OS versions
-rw-r--r--.github/workflows/release.yml24
1 files changed, 12 insertions, 12 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bde40c7a..b307ce5e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ on:
jobs:
create-release:
name: create-release
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
# env:
# Set to force version number, e.g., when no tag exists.
# RG_VERSION: TEST-0.0.0
@@ -64,27 +64,27 @@ jobs:
build: [linux, linux-arm, macos, win-msvc, win-gnu, win32-msvc]
include:
- build: linux
- os: ubuntu-22.04
+ os: ubuntu-latest
rust: nightly
target: x86_64-unknown-linux-musl
- build: linux-arm
- os: ubuntu-22.04
+ os: ubuntu-latest
rust: nightly
target: arm-unknown-linux-gnueabihf
- build: macos
- os: macos-12
+ os: macos-latest
rust: nightly
target: x86_64-apple-darwin
- build: win-msvc
- os: windows-2022
+ os: windows-latest
rust: nightly
target: x86_64-pc-windows-msvc
- build: win-gnu
- os: windows-2022
+ os: windows-latest
rust: nightly-x86_64-gnu
target: x86_64-pc-windows-gnu
- build: win32-msvc
- os: windows-2022
+ os: windows-latest
rust: nightly
target: i686-pc-windows-msvc
@@ -93,12 +93,12 @@ jobs:
uses: actions/checkout@v3
- name: Install packages (Ubuntu)
- if: matrix.os == 'ubuntu-22.04'
+ if: matrix.os == 'ubuntu-latest'
run: |
ci/ubuntu-install-packages
- name: Install packages (macOS)
- if: matrix.os == 'macos-12'
+ if: matrix.os == 'macos-latest'
run: |
ci/macos-install-packages
@@ -125,8 +125,8 @@ jobs:
- name: Build release binary
run: ${{ env.CARGO }} build --verbose --release --features pcre2 ${{ env.TARGET_FLAGS }}
- - name: Strip release binary (linux and macos)
- if: matrix.build == 'linux' || matrix.build == 'macos'
+ - name: Strip release binary (linux, macos and macos-arm)
+ if: matrix.build == 'linux' || matrix.os == 'macos'
run: strip "target/${{ matrix.target }}/release/rg"
- name: Strip release binary (arm)
@@ -150,7 +150,7 @@ jobs:
cp "$outdir"/{rg.bash,rg.fish,_rg.ps1} "$staging/complete/"
cp complete/_rg "$staging/complete/"
- if [ "${{ matrix.os }}" = "windows-2022" ]; then
+ if [ "${{ matrix.os }}" = "windows-latest" ]; then
cp "target/${{ matrix.target }}/release/rg.exe" "$staging/"
7z a "$staging.zip" "$staging"
certutil -hashfile "$staging.zip" SHA256 > "$staging.zip.sha256"