ci: lint fixes and older ubuntu runner

szattila98 · Mar 24, 2024 · fb6480c · fb6480c
1 parent 6c38f8f
commit fb6480c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 37 deletions.
diff --git a/.github/workflows/lints-and-tests.yml b/.github/workflows/lints-and-tests.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
     commit-check:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-20.04
         name: Check conventional commit compliance
         steps:
             - uses: actions/checkout@v4
@@ -22,7 +22,7 @@ jobs:
               uses: cocogitto/cocogitto-action@v3
 
     frontend-checks:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-20.04
         name: Frontend checks
         needs: [commit-check]
         steps:
@@ -51,22 +51,22 @@ jobs:
                   retention-days: 30
 
     backend-checks:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-20.04
         name: Backend checks
         needs: [commit-check, frontend-checks]
         steps:
             - uses: actions/checkout@v4
 
             - uses: Swatinem/rust-cache@v2
               with:
-                  shared-key: whooosh-ubuntu-latest
+                  shared-key: whooosh-ubuntu-20.04
                   workspaces: src-tauri
 
             - uses: dtolnay/rust-toolchain@stable
 
             - uses: awalsh128/cache-apt-pkgs-action@latest
               with:
-                  packages: libwebkit2gtk-4.0-dev build-essential curl wget file libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev
+                  packages: libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
                   version: 1.0
 
             - name: Backend check

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,7 +16,7 @@ permissions:
 jobs:
     upload_license:
         name: Upload License
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-20.04
         steps:
             - uses: actions/checkout@v4
 
@@ -30,7 +30,7 @@ jobs:
         runs-on: ${{ matrix.platform }}
         strategy:
             matrix:
-                platform: [macos-latest, windows-latest, ubuntu-latest]
+                platform: [macos-latest, windows-latest, ubuntu-20.04]
 
         steps:
             - uses: actions/checkout@v4
@@ -44,18 +44,11 @@ jobs:
 
             - uses: dtolnay/rust-toolchain@stable
 
-            - if: matrix.platform == 'ubuntu-latest'
-              run: |
-                  sudo apt update
-                  sudo apt install libwebkit2gtk-4.0-dev \
-                      build-essential \
-                      curl \
-                      wget \
-                      file \
-                      libssl-dev \
-                      libgtk-3-dev \
-                      libayatana-appindicator3-dev \
-                      librsvg2-dev
+            - if: matrix.platform == 'ubuntu-20.04'
+              uses: awalsh128/cache-apt-pkgs-action@latest
+              with:
+                  packages: libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
+                  version: 1.0
 
             - run: yarn install --immutable
 
@@ -70,7 +63,7 @@ jobs:
     upload_to_release:
         needs: [build, upload_license]
         name: Publish binaries
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-20.04
         if: ${{ github.ref_type == 'tag' }}
         steps:
             - uses: actions/download-artifact@v4
@@ -89,7 +82,7 @@ jobs:
                   cp -r LICENSE/LICENSE windows/
                   tar -czf windows.tar.gz windows/*
 
-                  mv artifact-ubuntu-latest linux
+                  mv artifact-ubuntu-20.04 linux
                   chmod +x -R linux
                   cp -r LICENSE/LICENSE linux/
                   tar -czf linux.tar.gz linux/*

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ permissions:
 
 jobs:
     release:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-20.04
         steps:
             - name: Wait on checks
               uses: lewagon/wait-on-check-action@master

diff --git a/.github/workflows/tauri.yml b/.github/workflows/tauri.yml
@@ -18,7 +18,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                platform: [macos-latest, ubuntu-latest, windows-latest]
+                platform: [macos-latest, ubuntu-20.04, windows-latest]
 
         runs-on: ${{ matrix.platform }}
         steps:
@@ -33,18 +33,11 @@ jobs:
 
             - uses: dtolnay/rust-toolchain@stable
 
-            - if: matrix.platform == 'ubuntu-latest'
-              run: |
-                  sudo apt update
-                  sudo apt install libwebkit2gtk-4.0-dev \
-                      build-essential \
-                      curl \
-                      wget \
-                      file \
-                      libssl-dev \
-                      libgtk-3-dev \
-                      libayatana-appindicator3-dev \
-                      librsvg2-dev
+            - if: matrix.platform == 'ubuntu-20.04'
+              uses: awalsh128/cache-apt-pkgs-action@latest
+              with:
+                  packages: libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
+                  version: 1.0
 
             - run: yarn install --immutable
 

diff --git a/src/App.svelte b/src/App.svelte
@@ -7,7 +7,6 @@
 	import { todaysHighlight } from './store';
 	import { exit } from '@tauri-apps/api/process';
 	import Spinner from './lib/components/Spinner.svelte';
-	import { fade } from 'svelte/transition';
 
 	enum AppState {
 		Loading,

diff --git a/src/lib/components/Spinner.svelte b/src/lib/components/Spinner.svelte
@@ -38,7 +38,6 @@
 				50% 50%,
 				50% 50%;
 		}
-		75%,
 		75% {
 			background-position:
 				50% -50px,
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,6 @@ @@
 % 50%,
 % 50%;
     		}
-%,
 % {
     			background-position:
 % -50px,
@@ Expand Down @@