Skip to content

Commit

Permalink
Merge pull request #1414 from hovancik/up/deps
Browse files Browse the repository at this point in the history
Up deps
  • Loading branch information
hovancik authored Jan 6, 2024
2 parents 713aca6 + 5e2242b commit 509d835
Show file tree
Hide file tree
Showing 8 changed files with 170 additions and 134 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/arm-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '18.17.1'
node-version: '18.18.2'
- run: sudo apt update && sudo apt-get install --no-install-recommends -y ruby-full libarchive-tools
- run: sudo gem install fpm -v 1.15
- run: npm install npm@9 -g
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
python-version: '3.11'
- uses: actions/setup-node@v3
with:
node-version: '18.17.1'
node-version: '18.18.2'
- run: npm install npm@9 -g
- run: npm install
- run: node_modules/.bin/electron-builder build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snap-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '18.17.1'
node-version: '18.18.2'
- run: npm install -g npm@9
- run: npm install
- run: node_modules/.bin/electron-builder --linux snap --publish=never
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '18.17.1'
node-version: '18.18.2'
- run: npm install npm@9 -g
- run: npm install
- name: Install missing usocket
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.17.1
18.18.2
6 changes: 3 additions & 3 deletions app/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ function startMicrobreak () {
let microbreakWinLocal = new BrowserWindow(windowOptions)
// seems to help with multiple-displays problems
microbreakWinLocal.setSize(windowOptions.width, windowOptions.height)

ipcMain.on('send-microbreak-data', (event) => {
const startTime = Date.now()
if (!strictMode || postponable) {
Expand Down Expand Up @@ -1083,9 +1083,9 @@ function resetBreaks () {
}

function calculateBackgroundColor (color) {
let opacityMultiplier = 1;
let opacityMultiplier = 1
if (settings.get('transparentMode')) {
opacityMultiplier = settings.get('opacity');
opacityMultiplier = settings.get('opacity')
}
return color + Math.round(opacityMultiplier * 255).toString(16)
}
Expand Down
Loading

0 comments on commit 509d835

Please sign in to comment.