diff options
| author | Martin Nordholts <enselic@gmail.com> | 2021-01-06 21:27:16 +0100 |
|---|---|---|
| committer | David Peter <sharkdp@users.noreply.github.com> | 2021-01-06 23:11:24 +0100 |
| commit | c67b43975248c0ad3e4e699623f05f472fc48a9a (patch) | |
| tree | e26727026e47fbdce695ce55502e3b6a0ebf1565 /.github | |
| parent | 2b44940f81cb2bfcf9747a0ad23d1f1a5545aea7 (diff) | |
CICD: Build: Enable x86_64-pc-windows-gnu again
All the referenced issues [1] have been Closed, so use "stable" for
everything. Now `i686-w64-mingw32-gcc` fails with this instead
error: linker `i686-w64-mingw32-gcc` not found
so keep it disabled. There is probably a simple solution for this that
is obvious to someone used to cross-compiling Rust programs on
Windows...
[1]
https://github.com/rust-lang/rust/issues/47048
https://github.com/rust-lang/rust/issues/53454
https://github.com/rust-lang/cargo/issues/6754
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/CICD.yml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 8f6696b9..85838867 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -92,9 +92,9 @@ jobs: - { os: ubuntu-18.04 , target: x86_64-unknown-linux-musl , use-cross: use-cross } - { os: ubuntu-16.04 , target: x86_64-unknown-linux-gnu } - { os: macos-latest , target: x86_64-apple-darwin } - # - { os: windows-latest , target: i686-pc-windows-gnu } ## disabled; linker errors (missing '_imp____acrt_iob_func') + # - { os: windows-latest , target: i686-pc-windows-gnu } ## disabled; error: linker `i686-w64-mingw32-gcc` not found - { os: windows-latest , target: i686-pc-windows-msvc } - # - { os: windows-latest , target: x86_64-pc-windows-gnu } ## disabled; linker errors (missing '_imp____acrt_iob_func') + - { os: windows-latest , target: x86_64-pc-windows-gnu } - { os: windows-latest , target: x86_64-pc-windows-msvc } steps: - name: Git checkout @@ -112,8 +112,6 @@ jobs: run: | # toolchain TOOLCHAIN="stable" ## default to "stable" toolchain - # * 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>) - case ${{ matrix.job.target }} in *-pc-windows-gnu) TOOLCHAIN="stable-${{ matrix.job.target }}" ;; esac; # * use requested TOOLCHAIN if specified if [ -n "${{ matrix.job.toolchain }}" ]; then TOOLCHAIN="${{ matrix.job.toolchain }}" ; fi echo ::set-output name=TOOLCHAIN::${TOOLCHAIN} |