Merge pull request #64 from LebedevRI/cross

CI: move windows msvc jobs to linux cross too

Author: LebedevRI

.github/workflows/CI-linux.yml

@@ -45,7 +45,7 @@ env:
   RUSTFLAGS: "-Dwarnings"
   SRC_DIR: ${{ github.workspace }}/rawspeed.rs
   CODECOV_TOKEN_EXISTS: ${{ secrets.CODECOV_TOKEN != '' }}
-  CODE_COVERAGE_SUPPORTED: ${{ inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && inputs.target-os != 'windows' }}
+  CODE_COVERAGE_SUPPORTED: ${{ inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && (inputs.target-os != 'windows' || inputs.rust-toolchain-abi == 'msvc') }}
 
 jobs:
   linux:
@@ -180,6 +180,7 @@ jobs:
           ln -s /usr/bin/clang-${{ inputs.distro-LLVM }} /usr/local/bin/clang
           ln -s /usr/bin/clang++-${{ inputs.distro-LLVM }} /usr/local/bin/clang++
           ln -s /usr/bin/ld.lld-${{ inputs.distro-LLVM }} /usr/local/bin/ld.lld
+          ln -s /usr/bin/lld-link-${{ inputs.distro-LLVM }} /usr/local/bin/lld-link
           ln -s /usr/local/bin/clang /usr/local/bin/cc
           ln -s /usr/local/bin/clang /usr/local/bin/gcc
           ln -s /usr/local/bin/clang++ /usr/local/bin/c++
@@ -232,22 +233,36 @@ jobs:
           if [ "${{ inputs.builder-target }}" = "i686" ]; then
           eatmydata dpkg --add-architecture i386
           fi
+          if [ "${{ inputs.rust-toolchain-abi }}" = "gnu" ]; then
           PACKAGES="${PACKAGES} \
             mingw-w64 \
+          "
+          fi
+          PACKAGES="${PACKAGES} \
             wine \
           "
           if [ "${{ inputs.builder-target }}" = "i686" ]; then
           PACKAGES="${PACKAGES} \
             wine32:i386 \
           "
           fi
+          if [ "${{ inputs.rust-toolchain-abi }}" = "msvc" ]; then
+          PACKAGES="${PACKAGES} \
+            python3 msitools \
+          "
+          fi
           mkdir -p "$HOME/.cargo" && tee -a "$HOME/.cargo/config.toml" > /dev/null <<EOT
           [target.${{ env.RUST_TARGET }}]
           runner = "wine"
           EOT
+          if [ "${{ inputs.rust-toolchain-abi }}" = "msvc" ]; then
+          mkdir -p "$HOME/.cargo" && tee -a "$HOME/.cargo/config.toml" > /dev/null <<EOT
+          linker = "lld-link"
+          EOT
+          fi
           echo "PACKAGES=$(echo ${PACKAGES})" >> $GITHUB_ENV
       - name: Install the packages
-        timeout-minutes: 1
+        timeout-minutes: 2
         run: |
           set -xe
           rm -rf /var/lib/apt/lists/*
@@ -282,6 +297,36 @@ jobs:
           . "$HOME/.cargo/env"
           eatmydata rustup component add llvm-tools-preview
           eatmydata cargo install cargo-llvm-cov
+      - name: Fetch/Checkout msvc-wine git repo
+        timeout-minutes: 1
+        if: inputs.target-os == 'windows' && inputs.rust-toolchain-abi == 'msvc'
+        uses: actions/checkout@v4
+        with:
+          repository: 'mstorsjo/msvc-wine'
+          path: 'msvc-wine'
+          fetch-depth: 1
+          set-safe-directory: ${{ github.workspace }}
+      - name: Perform msvc-wine stuff
+        timeout-minutes: 2
+        if: inputs.target-os == 'windows' && inputs.rust-toolchain-abi == 'msvc'
+        run: |
+          set -xe
+          . "$HOME/.cargo/env"
+          cd msvc-wine
+          if [ "${{ inputs.builder-target }}" = "x86_64" ]; then
+          MSVC_ARCH=x64
+          elif [ "${{ inputs.builder-target }}" = "i686" ]; then
+          MSVC_ARCH=x86
+          elif [ "${{ inputs.builder-target }}" = "aarch64" ]; then
+          MSVC_ARCH=arm64
+          else
+          exit 1
+          fi
+          PYTHONUNBUFFERED=1 ./vsdownload.py --accept-license --dest /opt/msvc
+          ./install.sh /opt/msvc
+          tee -a "$HOME/.cargo/env" > /dev/null <<EOT
+          BIN=/opt/msvc/bin/${MSVC_ARCH} . $(pwd)/msvcenv-native.sh
+          EOT
       - name: Fetch/Checkout RawSpeed.RS git repo
         timeout-minutes: 1
         uses: actions/checkout@v4

.github/workflows/CI-windows-msys2.yml

@@ -44,13 +44,19 @@ jobs:
       matrix:
         os: [ linux ]
         stack:
-          - { runs-on: "ubuntu-latest", host: "x86_64", target: "x86_64", vendor: "pc", os: "windows" }
-          - { runs-on: "ubuntu-latest", host: "x86_64", target: "i686",   vendor: "pc", os: "windows" }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "x86_64",  vendor: "pc", os: "windows" }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "i686",    vendor: "pc", os: "windows" }
+          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "aarch64", vendor: "pc", os: "windows" }
         distro:
           - { image: "debian:trixie-slim", LLVM: 19 }
-        abi: [ gnu ]
+        abi: [ gnu, msvc ]
         rust-toolchain-name: [ stable, nightly ]
         flavor: [ dev, release ]
+        exclude:
+          - stack: { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "aarch64", vendor: "pc", os: "windows" }
+            abi: gnu
+          - stack: { runs-on: "ubuntu-latest",    host: "x86_64",  target: "i686",    vendor: "pc", os: "windows" }
+            abi: msvc
     uses: ./.github/workflows/CI-linux.yml
     with:
       os: ${{ matrix.os }}
@@ -67,7 +73,7 @@ jobs:
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
   linux-cross:
-    needs: [ linux-fast, windows-cross, windows-msys2-fast, macOS-fast ]
+    needs: [ linux-fast, windows-cross, macOS-fast ]
     strategy:
       fail-fast: false
       matrix:
@@ -99,28 +105,6 @@ jobs:
       flavor: ${{ matrix.flavor }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-  windows-msys2-fast:
-    strategy:
-      fail-fast: false
-      matrix:
-        stack:
-          - { os: windows, os-ver: latest, host: "x86_64",  target: "x86_64",  msystem: CLANG64 }
-          - { os: windows, os-ver: 11-arm, host: "aarch64", target: "aarch64", msystem: CLANGARM64 }
-        rust-toolchain-version: [ stable, nightly ]
-        rust-toolchain-abi: [ msvc ]
-        flavor: [ dev, release ]
-    uses: ./.github/workflows/CI-windows-msys2.yml
-    with:
-      os: ${{ matrix.stack.os }}
-      runs-on: ${{ matrix.stack.os }}-${{ matrix.stack.os-ver }}
-      builder-host: ${{ matrix.stack.host }}
-      builder-target: ${{ matrix.stack.target }}
-      msys2-msystem: ${{ matrix.stack.msystem }}
-      rust-toolchain-version: ${{ matrix.rust-toolchain-version }}
-      rust-toolchain-abi: ${{ matrix.rust-toolchain-abi }}
-      flavor: ${{ matrix.flavor }}
-    secrets:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
   macOS-fast:
     strategy:
       fail-fast: false
@@ -143,7 +127,7 @@ jobs:
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
   build-docs:
-    needs: [ linux-fast, windows-cross, linux-cross, windows-msys2-fast, macOS-fast ]
+    needs: [ linux-fast, windows-cross, linux-cross, macOS-fast ]
     uses: ./.github/workflows/CI-linux.yml
     with:
       os: linux