Upgrade Windows Actions runners to windows-latest (#1137)
This commit is contained in:
parent
599c4b29a6
commit
9da8f41895
10
.github/workflows/ci.yaml
vendored
10
.github/workflows/ci.yaml
vendored
@ -21,7 +21,7 @@ jobs:
|
||||
os:
|
||||
- ubuntu-latest
|
||||
- macos-latest
|
||||
- windows-2016
|
||||
- windows-latest
|
||||
|
||||
runs-on: ${{matrix.os}}
|
||||
|
||||
@ -31,6 +31,14 @@ jobs:
|
||||
steps:
|
||||
- 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
|
||||
uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
|
2
.github/workflows/release.yaml
vendored
2
.github/workflows/release.yaml
vendored
@ -32,7 +32,7 @@ jobs:
|
||||
os: macos-latest
|
||||
target_rustflags: ''
|
||||
- target: x86_64-pc-windows-msvc
|
||||
os: windows-2016
|
||||
os: windows-latest
|
||||
target_rustflags: ''
|
||||
- target: x86_64-unknown-linux-musl
|
||||
os: ubuntu-latest
|
||||
|
@ -14,7 +14,7 @@ RUSTFLAGS="--deny warnings --codegen target-feature=+crt-static $TARGET_RUSTFLAG
|
||||
cargo build --bin just --target $TARGET --release
|
||||
EXECUTABLE=target/$TARGET/release/just
|
||||
|
||||
if [[ $OS == windows-2016 ]]; then
|
||||
if [[ $OS == windows-latest ]]; then
|
||||
EXECUTABLE=$EXECUTABLE.exe
|
||||
fi
|
||||
|
||||
@ -38,7 +38,7 @@ case $OS in
|
||||
tar czf $ARCHIVE *
|
||||
echo "::set-output name=archive::$ARCHIVE"
|
||||
;;
|
||||
windows-2016)
|
||||
windows-latest)
|
||||
ARCHIVE=$DIST/just-$VERSION-$TARGET.zip
|
||||
7z a $ARCHIVE *
|
||||
echo "::set-output name=archive::`pwd -W`/just-$VERSION-$TARGET.zip"
|
||||
|
Loading…
Reference in New Issue
Block a user