From 5425c49e19f8dd552231b1fc813a366cc8691d61 Mon Sep 17 00:00:00 2001 From: John Michael Burke Date: Tue, 20 Sep 2022 15:46:17 -0700 Subject: [PATCH 1/2] Fix imagemagick version conflict with CI. --- Makefile.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.toml b/Makefile.toml index 1505d5ae6..53d5d1dd5 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -348,7 +348,7 @@ exec --fail-on-error ${DIST_PYTHON} ./get-pip.py script_runner = "@duckscript" script = ''' wget -O imagemagick.tool.7.1.0.nupkg https://github.com/swift-nav/swift-toolchains/releases/download/imagemagick-7.1.0/imagemagick.tool.7.1.0.nupkg -exec --fail-on-error choco install -q -y vcredist2010 --version=10.0.40219.1 +exec --fail-on-error choco install -q -y --side-by-side vcredist2010 --version=10.0.40219.32503 exec --fail-on-error choco install -q -y ./imagemagick.tool.7.1.0.nupkg rm imagemagick.tool.7.1.0.nupkg ''' From 801e00104fe48426979784339237573a3b6752db Mon Sep 17 00:00:00 2001 From: John Michael Burke Date: Tue, 20 Sep 2022 16:50:36 -0700 Subject: [PATCH 2/2] Install libssl-dev. --- .github/workflows/main.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 17f6758be..7de4f7c84 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,7 +61,7 @@ jobs: shell: bash run: | if [ "$RUNNER_OS" == "Linux" ]; then - sudo apt-get update && sudo apt-get install -y capnproto libudev-dev + sudo apt-get update && sudo apt-get install -y capnproto libudev-dev libssl-dev elif [ "$RUNNER_OS" == "macOS" ]; then brew install capnp llvm elif [ "$RUNNER_OS" == "Windows" ]; then @@ -157,7 +157,7 @@ jobs: - name: Install Dependencies. run: | - sudo apt-get update && sudo apt-get install -y capnproto libudev-dev + sudo apt-get update && sudo apt-get install -y capnproto libudev-dev libssl-dev - name: Cache pip uses: actions/cache@v2 @@ -264,7 +264,8 @@ jobs: ruby-dev \ rubygems \ build-essential \ - libudev-dev + libudev-dev \ + libssl-dev sudo gem install --no-document fpm elif [ "$RUNNER_OS" == "macOS" ]; then brew install capnp llvm create-dmg