Skip to content

Commit 2fb1ebd

Browse files
committed
CICD: Build: Enable *-pc-windows-gnu builds again (with 'stable')
All the referenced issues have been closed: rust-lang/rust#47048 rust-lang/rust#53454 rust-lang/cargo#6754 Since we can (and should) use 'stable' on these targets too, we don't need the TOOLCHAIN logic any longer, so remove it.
1 parent ef6525d commit 2fb1ebd

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

.github/workflows/CICD.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ jobs:
9292
- { os: ubuntu-18.04 , target: x86_64-unknown-linux-musl , use-cross: use-cross }
9393
- { os: ubuntu-16.04 , target: x86_64-unknown-linux-gnu }
9494
- { os: macos-latest , target: x86_64-apple-darwin }
95-
# - { os: windows-latest , target: i686-pc-windows-gnu , use-cross: use-cross } ## disabled; linker errors (missing '_imp____acrt_iob_func')
95+
- { os: windows-latest , target: i686-pc-windows-gnu , use-cross: use-cross }
9696
- { os: windows-latest , target: i686-pc-windows-msvc }
97-
# - { os: windows-latest , target: x86_64-pc-windows-gnu , use-cross: use-cross } ## disabled; linker errors (missing '_imp____acrt_iob_func')
97+
- { os: windows-latest , target: x86_64-pc-windows-gnu , use-cross: use-cross }
9898
- { os: windows-latest , target: x86_64-pc-windows-msvc }
9999
steps:
100100
- name: Git checkout
@@ -110,10 +110,6 @@ jobs:
110110
id: vars
111111
shell: bash
112112
run: |
113-
# toolchain
114-
TOOLCHAIN="stable" ## default to "stable" toolchain
115-
# * specify alternate TOOLCHAIN for *-pc-windows-gnu targets; gnu targets on Windows are broken for the standard *-pc-windows-msvc toolchain (refs: <https://github.com/rust-lang/rust/issues/47048>, <https://github.com/rust-lang/rust/issues/53454>, <https://github.com/rust-lang/cargo/issues/6754>)
116-
case ${{ matrix.job.target }} in *-pc-windows-gnu) TOOLCHAIN="stable-${{ matrix.job.target }}" ;; esac;
117113
# staging directory
118114
STAGING='_staging'
119115
echo set-output name=STAGING::${STAGING}
@@ -214,7 +210,7 @@ jobs:
214210
- name: Install Rust toolchain
215211
uses: actions-rs/toolchain@v1
216212
with:
217-
toolchain: ${{ steps.vars.outputs.TOOLCHAIN }}
213+
toolchain: stable
218214
target: ${{ matrix.job.target }}
219215
override: true
220216
profile: minimal # minimal component installation (ie, no documentation)

0 commit comments

Comments
 (0)