Skip to content

Commit ad59d94

Browse files
authored
6.0.0 - drop windows 7 support (#251)
1 parent 4c54cb9 commit ad59d94

File tree

12 files changed

+135
-152
lines changed

12 files changed

+135
-152
lines changed

.cargo/config.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
[target.i686-pc-windows-msvc]
22
rustflags = ["-C", "target-feature=+crt-static"]
33

4-
[target.i686-win7-windows-msvc]
5-
rustflags = ["-C", "target-feature=+crt-static"]
6-
74
[target.x86_64-pc-windows-msvc]
85
rustflags = ["-C", "target-feature=+crt-static"]

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ jobs:
1414

1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1818

1919
# Download 32-bit artifacts
2020
- name: Download Windows Build Artifact
21-
uses: dawidd6/action-download-artifact@v9
21+
uses: dawidd6/action-download-artifact@v12
2222
with:
2323
name: Windows Build
2424
workflow: rust.yml
2525
branch: master
2626
path: ./artifacts/windows
2727

2828
- name: Download Linux Build Artifact
29-
uses: dawidd6/action-download-artifact@v9
29+
uses: dawidd6/action-download-artifact@v12
3030
with:
3131
name: Linux Build
3232
workflow: rust.yml
@@ -35,15 +35,15 @@ jobs:
3535

3636
# Download 64-bit artifacts
3737
- name: Download Windows x64 Build Artifact
38-
uses: dawidd6/action-download-artifact@v9
38+
uses: dawidd6/action-download-artifact@v12
3939
with:
4040
name: Windows Build x64
4141
workflow: rust.yml
4242
branch: master
4343
path: ./artifacts/windows-x64
4444

4545
- name: Download Linux x64 Build Artifact
46-
uses: dawidd6/action-download-artifact@v9
46+
uses: dawidd6/action-download-artifact@v12
4747
with:
4848
name: Linux Build x64
4949
workflow: rust.yml
@@ -57,8 +57,8 @@ jobs:
5757
draft: true
5858
generate_release_notes: true
5959
files: |
60-
./artifacts/windows/i686-win7-windows-msvc/release/rust_g.dll
61-
./artifacts/windows/i686-win7-windows-msvc/release/rust_g.pdb
60+
./artifacts/windows/i686-pc-windows-msvc/release/rust_g.dll
61+
./artifacts/windows/i686-pc-windows-msvc/release/rust_g.pdb
6262
./artifacts/windows-x64/x86_64-pc-windows-msvc/release/rust_g64.dll
6363
./artifacts/windows-x64/x86_64-pc-windows-msvc/release/rust_g64.pdb
6464
./artifacts/linux/i686-unknown-linux-gnu/release/librust_g.so

.github/workflows/rust.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,56 +20,56 @@ jobs:
2020
bash scripts/install_byond.sh
2121
echo "BYOND_BIN=$env:USERPROFILE\BYOND\byond\bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
2222
23-
- uses: dtolnay/rust-toolchain@nightly
23+
- uses: dtolnay/rust-toolchain@1.89
2424
with:
25-
targets: x86_64-pc-windows-msvc
26-
components: clippy, rustfmt, rust-src
25+
targets: i686-pc-windows-msvc
26+
components: clippy, rustfmt
2727

2828
- uses: Swatinem/rust-cache@v2
2929

3030
- name: Clippy (all features)
31-
run: cargo clippy -Z build-std --target i686-win7-windows-msvc --features all --locked -- -D warnings
31+
run: cargo clippy --target i686-pc-windows-msvc --features all --locked -- -D warnings
3232

3333
- name: Rustfmt
3434
run: cargo fmt -- --check
3535

3636
- name: Build (Debug) (all features)
37-
run: cargo build -Z build-std --target i686-win7-windows-msvc --locked --features all
37+
run: cargo build --target i686-pc-windows-msvc --locked --features all
3838

3939
- name: Run tests (all features)
40-
run: cargo test -Z build-std --target i686-win7-windows-msvc --locked --features all
40+
run: cargo test --target i686-pc-windows-msvc --locked --features all
4141

4242
- name: Build (release) (default features)
43-
run: cargo build -Z build-std --target i686-win7-windows-msvc --locked --release
43+
run: cargo build --target i686-pc-windows-msvc --locked --release
4444

4545
- uses: actions/upload-artifact@v6
4646
with:
4747
name: Windows Build
4848
path: |
49-
target/i686-win7-windows-msvc/release/rust_g.dll
50-
target/i686-win7-windows-msvc/release/rust_g.pdb
49+
target/i686-pc-windows-msvc/release/rust_g.dll
50+
target/i686-pc-windows-msvc/release/rust_g.pdb
5151
target/rust_g.dm
5252
5353
build-windows-x64:
5454
runs-on: windows-latest
5555
steps:
56-
- uses: actions/checkout@v4
56+
- uses: actions/checkout@v6
5757

58-
- uses: dtolnay/rust-toolchain@nightly
58+
- uses: dtolnay/rust-toolchain@1.89
5959
with:
6060
targets: x86_64-pc-windows-msvc
61-
components: clippy, rustfmt, rust-src
61+
components: clippy, rustfmt
6262

6363
- uses: Swatinem/rust-cache@v2
6464

6565
- name: x64 Clippy (all features)
66-
run: cargo clippy -Z build-std --target x86_64-pc-windows-msvc --features all,allow_non_32bit --locked -- -D warnings
66+
run: cargo clippy --target x86_64-pc-windows-msvc --features all,allow_non_32bit --locked -- -D warnings
6767

6868
- name: Rustfmt
6969
run: cargo fmt -- --check
7070

7171
- name: x64 Build (release) (default features)
72-
run: cargo build -Z build-std --target x86_64-pc-windows-msvc --features allow_non_32bit --locked --release
72+
run: cargo build --target x86_64-pc-windows-msvc --features allow_non_32bit --locked --release
7373

7474
- name: Rename x64 artifacts
7575
run: |
@@ -100,7 +100,7 @@ jobs:
100100
sudo apt-get install libgcc-s1:i386 g++-multilib zlib1g-dev:i386 libcurl4:i386
101101
./scripts/install_byond.sh
102102
103-
- uses: dtolnay/rust-toolchain@nightly
103+
- uses: dtolnay/rust-toolchain@1.89
104104
with:
105105
targets: i686-unknown-linux-gnu, x86_64-unknown-linux-gnu
106106

@@ -143,7 +143,7 @@ jobs:
143143
sudo apt-get install libgcc-s1:i386 g++-multilib zlib1g-dev:i386 libcurl4:i386
144144
./scripts/install_byond.sh
145145
146-
- uses: dtolnay/rust-toolchain@nightly
146+
- uses: dtolnay/rust-toolchain@1.89
147147
with:
148148
targets: x86_64-unknown-linux-gnu
149149

0 commit comments

Comments
 (0)