Cherry-pick bd00f7d 87b29d6 43208dc 88ae5b3 (#746)

swift-nav · Sep 22, 2022 · 93cbbaa · 93cbbaa
1 parent b0a56a1
commit 93cbbaa
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 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,9 @@ jobs:
                 ruby-dev \
                 rubygems \
                 build-essential \
-                libudev-dev
+                libudev-dev \
+                libssl-dev
+              sudo gem install public_suffix -v 4.0.7  # This is a fix for U18.
               sudo gem install --no-document fpm
           elif [ "$RUNNER_OS" == "macOS" ]; then
               brew install capnp llvm create-dmg

diff --git a/Cargo.lock b/Cargo.lock
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
 '''

diff --git a/resources/LogPanel.qml b/resources/LogPanel.qml
@@ -262,7 +262,7 @@ Item {
     }
 
     Timer {
-        interval: Globals.currentRefreshRate
+        interval: Utils.hzToMilliseconds(Globals.currentRefreshRate)
         running: parent.visible
         repeat: true
         onTriggered: {