diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7e12d128..a2d4caaf 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -56,6 +56,30 @@ jobs: ${{ env.HOME }}/.cargo" target + - name: Install openssl (apt armv7) + if: ${{ matrix.os == 'ubuntu-latest' && matrix.target == 'armv7-unknown-linux-gnueabihf' }} + run: | + sudo dpkg add-architecture armhf + sudo apt update + sudo apt install openssl-dev:armhf + + - name: Install openssl (vcpkg) + if: ${{ matrix.os == 'windows-latest' }} + run: | + vcpkg integrate install + vcpkg install openssl:x64-windows-static + echo "OPENSSL_DIR=C:/vcpkg/installed/x64-windows-static/" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append + echo "OPENSSL_ROOT_DIR=C:/vcpkg/installed/x64-windows-static/" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append + echo "OPENSSL_STATIC=1" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append + + - name: Cache vcpkg + if: ${{ matrix.os == 'windows-latest' }} + uses: actions/cache@v2 + with: + key: ${{ matrix.os }}-${{ matrix.target }} + path: $VCPKG_DIRECTORY + + - name: Build release uses: actions-rs/cargo@v1 with: @@ -83,7 +107,6 @@ jobs: tag: ${{ github.ref }} overwrite: true - release: name: Upload firmware artifacts to release runs-on: ubuntu-latest diff --git a/Cargo.toml b/Cargo.toml index 8c3e99a7..577d7419 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ log = "0.4.11" structopt = "0.3.21" simplelog = "0.8.0" anyhow = "1.0.35" -reqwest = { version = "0.10.9", features = [ "rustls-tls" ] } +reqwest = { version = "0.10.9" } tempdir = "0.3.7" flate2 = "1.0.19" tar = "0.4.30"