From 81e06d2d6bfe45b55fdce9975aaa69ee34a1e718 Mon Sep 17 00:00:00 2001 From: Alexander Esgen Date: Mon, 4 Apr 2022 11:34:13 +0200 Subject: [PATCH 1/2] Install libsecp256k1 on Windows Co-authored-by: Hamish Mackenzie --- .github/workflows/build.yml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec3f24e288f..4ef5333a3da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,7 +68,7 @@ jobs: tar zxvf libsodium-1.0.18-mingw.tar.gz sed -i "s|/d/a/1/s/|$RUNNER_TEMP_FWD\/|g" libsodium-win64/lib/pkgconfig/libsodium.pc - export PKG_CONFIG_PATH="$(readlink -f libsodium-win64/lib/pkgconfig)" + export PKG_CONFIG_PATH="$(readlink -f libsodium-win64/lib/pkgconfig | sed 's|^/d|D:|g' | tr / '\\')" echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV @@ -105,6 +105,34 @@ jobs: sudo make install cd ../.. + - name: Install secp256k1 (Windows) + if: matrix.os == 'windows-latest' + env: + RUNNER_TEMP: ${{ runner.temp }} + run: | + echo "RUNNER_TEMP=$RUNNER_TEMP" + cd "$RUNNER_TEMP" + + RUNNER_TEMP_FWD="$(echo "$RUNNER_TEMP" | sed 's|\\|/|g')" + + curl -Ls \ + --connect-timeout 5 \ + --max-time 10 \ + --retry 5 \ + --retry-delay 0 \ + --retry-max-time 40 \ + https://hydra.iohk.io/job/Cardano/haskell-nix/windows-secp256k1/latest/download/1 -o secp256k1.zip + mkdir secp256k1 + cd secp256k1 + unzip ../secp256k1.zip + cd .. + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH;$(readlink -f secp256k1/lib/pkgconfig | sed 's|^/d|D:|g' | tr / '\\')" + echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" + echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV + export SECP256K1_PATH="$(readlink -f secp256k1/bin | sed 's|^/d|D:|g' | tr / '\\')" + echo "SECP256K1_PATH=$SECP256K1_PATH" + echo "$SECP256K1_PATH" >> $GITHUB_PATH + - name: Set up temp directory env: RUNNER_TEMP: ${{ runner.temp }} From 12192cb87b68c8409f2713656b55ac52291f95ec Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Tue, 5 Apr 2022 15:30:55 +0200 Subject: [PATCH 2/2] Update bors.toml file --- bors.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bors.toml b/bors.toml index 6433b0251f8..c1a774c4e93 100644 --- a/bors.toml +++ b/bors.toml @@ -1,5 +1,7 @@ status = [ "ci/hydra:Cardano:ouroboros-network:required", + "build (8.10.7, ubuntu-20.04)", + "build (8.10.7, windows-latest)", ] timeout_sec = 7200 required_approvals = 1