Skip to content

Commit 93cbbaa

Browse files
1 parent b0a56a1 commit 93cbbaa

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
shell: bash
6363
run: |
6464
if [ "$RUNNER_OS" == "Linux" ]; then
65-
sudo apt-get update && sudo apt-get install -y capnproto libudev-dev
65+
sudo apt-get update && sudo apt-get install -y capnproto libudev-dev libssl-dev
6666
elif [ "$RUNNER_OS" == "macOS" ]; then
6767
brew install capnp llvm
6868
elif [ "$RUNNER_OS" == "Windows" ]; then
@@ -158,7 +158,7 @@ jobs:
158158

159159
- name: Install Dependencies.
160160
run: |
161-
sudo apt-get update && sudo apt-get install -y capnproto libudev-dev
161+
sudo apt-get update && sudo apt-get install -y capnproto libudev-dev libssl-dev
162162
163163
- name: Cache pip
164164
uses: actions/cache@v2
@@ -253,7 +253,9 @@ jobs:
253253
ruby-dev \
254254
rubygems \
255255
build-essential \
256-
libudev-dev
256+
libudev-dev \
257+
libssl-dev
258+
sudo gem install public_suffix -v 4.0.7 # This is a fix for U18.
257259
sudo gem install --no-document fpm
258260
elif [ "$RUNNER_OS" == "macOS" ]; then
259261
brew install capnp llvm create-dmg

Cargo.lock

Lines changed: 18 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ exec --fail-on-error ${DIST_PYTHON} ./get-pip.py
342342
script_runner = "@duckscript"
343343
script = '''
344344
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
345-
exec --fail-on-error choco install -q -y vcredist2010 --version=10.0.40219.1
345+
exec --fail-on-error choco install -q -y --side-by-side vcredist2010 --version=10.0.40219.32503
346346
exec --fail-on-error choco install -q -y ./imagemagick.tool.7.1.0.nupkg
347347
rm imagemagick.tool.7.1.0.nupkg
348348
'''

resources/LogPanel.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ Item {
262262
}
263263

264264
Timer {
265-
interval: Globals.currentRefreshRate
265+
interval: Utils.hzToMilliseconds(Globals.currentRefreshRate)
266266
running: parent.visible
267267
repeat: true
268268
onTriggered: {

0 commit comments

Comments
 (0)