This commit is contained in:
Rob Ede 2021-02-24 12:04:30 +00:00
parent 850f61ff49
commit 7115ced6b0
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
1 changed files with 14 additions and 33 deletions

View File

@ -39,40 +39,21 @@ jobs:
profile: minimal profile: minimal
override: true override: true
- name: Install OpenSSL (x64) # - name: Install MSYS2
if: matrix.target.triple == 'x86_64-pc-windows-msvc' # if: matrix.target.triple == 'x86_64-pc-windows-gnu'
run: | # uses: msys2/setup-msys2@v2
vcpkg integrate install # - name: Install MinGW Packages
vcpkg install openssl:x64-windows # if: matrix.target.triple == 'x86_64-pc-windows-gnu'
Get-ChildItem C:\vcpkg\installed\x64-windows\bin # run: |
Get-ChildItem C:\vcpkg\installed\x64-windows\lib # msys2 -c 'pacman -Sy --noconfirm pacman'
Copy-Item C:\vcpkg\installed\x64-windows\bin\libcrypto-1_1-x64.dll C:\vcpkg\installed\x64-windows\bin\libcrypto.dll # msys2 -c 'pacman --noconfirm -S base-devel pkg-config'
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 # - name: Generate Cargo.lock
if: matrix.target.triple == 'x86_64-pc-windows-gnu' # uses: actions-rs/cargo@v1
uses: msys2/setup-msys2@v2 # with:
- name: Install MinGW Packages # command: generate-lockfile
if: matrix.target.triple == 'x86_64-pc-windows-gnu' # - name: Cache Dependencies
run: | # uses: Swatinem/rust-cache@v1.2.0
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: Install cargo-hack - name: Install cargo-hack
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1