Fix imagemagick version conflict with CI + install libssl-dev in CI. (#…

…747)
swift-nav · Sep 21, 2022 · d159b26 · d159b26
1 parent 87b29d6
commit d159b26
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -62,7 +62,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
@@ -158,7 +158,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
@@ -253,7 +253,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

diff --git a/Makefile.toml b/Makefile.toml
@@ -342,7 +342,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
 '''