From 7115ced6b0c4d07cf1ad881271eb5e236f9addd3 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Wed, 24 Feb 2021 12:04:30 +0000 Subject: [PATCH] hmmm --- .github/workflows/ci.yml | 47 ++++++++++++---------------------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3f8f7c0..6e52a32b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,40 +39,21 @@ jobs: profile: minimal override: true - - name: Install OpenSSL (x64) - if: matrix.target.triple == 'x86_64-pc-windows-msvc' - run: | - vcpkg integrate install - vcpkg install openssl:x64-windows - Get-ChildItem C:\vcpkg\installed\x64-windows\bin - Get-ChildItem C:\vcpkg\installed\x64-windows\lib - Copy-Item C:\vcpkg\installed\x64-windows\bin\libcrypto-1_1-x64.dll C:\vcpkg\installed\x64-windows\bin\libcrypto.dll - Copy-Item C:\vcpkg\installed\x64-windows\bin\libssl-1_1-x64.dll C:\vcpkg\installed\x64-windows\bin\libssl.dll - - name: Install OpenSSL (x86) - if: matrix.target.triple == 'i686-pc-windows-msvc' - run: | - vcpkg integrate install - vcpkg install openssl:x86-windows - Get-ChildItem C:\vcpkg\installed\x86-windows\bin - Get-ChildItem C:\vcpkg\installed\x86-windows\lib - Copy-Item C:\vcpkg\installed\x86-windows\bin\libcrypto-1_1.dll C:\vcpkg\installed\x86-windows\bin\libcrypto.dll - Copy-Item C:\vcpkg\installed\x86-windows\bin\libssl-1_1.dll C:\vcpkg\installed\x86-windows\bin\libssl.dll + # - name: Install MSYS2 + # if: matrix.target.triple == 'x86_64-pc-windows-gnu' + # uses: msys2/setup-msys2@v2 + # - name: Install MinGW Packages + # if: matrix.target.triple == 'x86_64-pc-windows-gnu' + # run: | + # msys2 -c 'pacman -Sy --noconfirm pacman' + # msys2 -c 'pacman --noconfirm -S base-devel pkg-config' - - name: Install MSYS2 - if: matrix.target.triple == 'x86_64-pc-windows-gnu' - uses: msys2/setup-msys2@v2 - - name: Install MinGW Packages - if: matrix.target.triple == 'x86_64-pc-windows-gnu' - run: | - msys2 -c 'pacman -Sy --noconfirm pacman' - msys2 -c 'pacman --noconfirm -S base-devel pkg-config' - - - name: Generate Cargo.lock - uses: actions-rs/cargo@v1 - with: - command: generate-lockfile - - name: Cache Dependencies - uses: Swatinem/rust-cache@v1.2.0 + # - name: Generate Cargo.lock + # uses: actions-rs/cargo@v1 + # with: + # command: generate-lockfile + # - name: Cache Dependencies + # uses: Swatinem/rust-cache@v1.2.0 - name: Install cargo-hack uses: actions-rs/cargo@v1