Upgrade Windows Actions runners to windows-latest (#1137)

This commit is contained in:
Casey Rodarmor 2022-03-22 20:26:55 -07:00 committed by GitHub
parent 599c4b29a6
commit 9da8f41895
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions

View File

@ -21,7 +21,7 @@ jobs:
os: os:
- ubuntu-latest - ubuntu-latest
- macos-latest - macos-latest
- windows-2016 - windows-latest
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
@ -31,6 +31,14 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Remove Broken WSL bash executable
if: ${{ matrix.os == 'windows-latest' }}
shell: cmd
run: |
takeown /F C:\Windows\System32\bash.exe
icacls C:\Windows\System32\bash.exe /grant administrators:F
del C:\Windows\System32\bash.exe
- name: Install Rust Toolchain Components - name: Install Rust Toolchain Components
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:

View File

@ -32,7 +32,7 @@ jobs:
os: macos-latest os: macos-latest
target_rustflags: '' target_rustflags: ''
- target: x86_64-pc-windows-msvc - target: x86_64-pc-windows-msvc
os: windows-2016 os: windows-latest
target_rustflags: '' target_rustflags: ''
- target: x86_64-unknown-linux-musl - target: x86_64-unknown-linux-musl
os: ubuntu-latest os: ubuntu-latest

View File

@ -14,7 +14,7 @@ RUSTFLAGS="--deny warnings --codegen target-feature=+crt-static $TARGET_RUSTFLAG
cargo build --bin just --target $TARGET --release cargo build --bin just --target $TARGET --release
EXECUTABLE=target/$TARGET/release/just EXECUTABLE=target/$TARGET/release/just
if [[ $OS == windows-2016 ]]; then if [[ $OS == windows-latest ]]; then
EXECUTABLE=$EXECUTABLE.exe EXECUTABLE=$EXECUTABLE.exe
fi fi
@ -38,7 +38,7 @@ case $OS in
tar czf $ARCHIVE * tar czf $ARCHIVE *
echo "::set-output name=archive::$ARCHIVE" echo "::set-output name=archive::$ARCHIVE"
;; ;;
windows-2016) windows-latest)
ARCHIVE=$DIST/just-$VERSION-$TARGET.zip ARCHIVE=$DIST/just-$VERSION-$TARGET.zip
7z a $ARCHIVE * 7z a $ARCHIVE *
echo "::set-output name=archive::`pwd -W`/just-$VERSION-$TARGET.zip" echo "::set-output name=archive::`pwd -W`/just-$VERSION-$TARGET.zip"