fix: Test build windows gnu

808Mak1r · Oct 21, 2022 · b66efec · b66efec
1 parent bdd7047
commit b66efec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
@@ -139,7 +139,7 @@ jobs:
           # - { target: i686-unknown-linux-gnu      , os: ubuntu-20.04, use-cross: true }
           # - { target: i686-unknown-linux-musl     , os: ubuntu-20.04, use-cross: true }
           # - { target: x86_64-apple-darwin         , os: macos-10.15                   }
-          - { target: x86_64-pc-windows-gnu       , os: ubuntu-20.04               }
+          - { target: x86_64-pc-windows-gnu       , os: ubuntu-20.04, use-cross: true }
           # - { target: x86_64-pc-windows-msvc      , os: windows-2019                  }
           # - { target: x86_64-unknown-linux-gnu    , os: ubuntu-20.04, use-cross: true }
           # - { target: x86_64-unknown-linux-musl   , os: ubuntu-20.04, use-cross: true }

diff --git a/.github/workflows/gnu.yml b/.github/workflows/gnu.yml
@@ -28,11 +28,13 @@ jobs:
     - name: Install Rust (rustup)
       run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
     - run: rustup target add ${{ matrix.target }}
-    - name: Set crt-static
-      if: matrix.crt_static == 'yes'
-      run: echo RUSTFLAGS=-Ctarget-feature=+crt-static >> $GITHUB_ENV
+
+    # - name: Set crt-static
+    #   if: matrix.crt_static == 'yes'
+    #   run: echo RUSTFLAGS=-Ctarget-feature=+crt-static >> $GITHUB_ENV
+
     - name: Use strawberry perl
-      if: startsWith(matrix.os, 'windows')
+      # if: startsWith(matrix.os, 'windows')
       run: echo OPENSSL_SRC_PERL=C:/Strawberry/perl/bin/perl >> $GITHUB_ENV
 
     # - name: Download nasm.exe (Windows)
@@ -45,7 +47,7 @@ jobs:
     #     echo "OPENSSL_RUST_USE_NASM=1" >> $GITHUB_ENV
 
     - name: Run tests (Windows)
-      if: startsWith(matrix.os, 'windows')
+      # if: startsWith(matrix.os, 'windows')
       run: |
         cargo test --target ${{ matrix.target }} -vv
         cargo test --target ${{ matrix.target }} --release -vv