simplified dependency installing step

removed unecessary installs switched to apt-get
hiarthurbr · Jul 31, 2023 · 8a8bba7 · 8a8bba7
1 parent 4480439
commit 8a8bba7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 52 deletions.
diff --git a/.github/workflows/check-dev.yml b/.github/workflows/check-dev.yml
@@ -14,18 +14,8 @@ jobs:
     - uses: actions/checkout@v3
     - name: Setup compiler
       run: rustup update stable && rustup default stable
-    - name: Install gdk-3.0
-      run: sudo apt install -y libgdk3.0-cil-dev
-    - name: Install libsoup2
-      run: sudo apt install -y libsoup2.4-dev
-    - name: Install libjavascriptcoregtk
-      run: sudo apt install -y libjavascriptcoregtk-4.0-dev
-    - name: Install libwebkit2gtk
-      run: sudo apt install -y libwebkit2gtk-4.0-dev
-    - name: Install librsvg2
-      run: sudo apt install -y librsvg2-dev
-    - name: Install libssl
-      run: sudo apt install -y libssl-dev
+    - name: Install dependencies
+      run: sudo apt-get install --no-install-recommends -y libgdk3.0-cil-dev libsoup2.4-dev libjavascriptcoregtk-4.0-dev libwebkit2gtk-4.0-dev
     - name: Check
       run: cargo check --verbose
     - name: Run tests
@@ -41,18 +31,8 @@ jobs:
       run: rustup update beta && rustup default beta
     - name: Setup formatter
       run: rustup component add rustfmt --toolchain beta
-    - name: Install gdk-3.0
-      run: sudo apt install -y libgdk3.0-cil-dev
-    - name: Install libsoup2
-      run: sudo apt install -y libsoup2.4-dev
-    - name: Install libjavascriptcoregtk
-      run: sudo apt install -y libjavascriptcoregtk-4.0-dev
-    - name: Install libwebkit2gtk
-      run: sudo apt install -y libwebkit2gtk-4.0-dev
-    - name: Install librsvg2
-      run: sudo apt install -y librsvg2-dev
-    - name: Install libssl
-      run: sudo apt install -y libssl-dev
+    - name: Install dependencies
+      run: sudo apt-get install --no-install-recommends -y libgdk3.0-cil-dev libsoup2.4-dev libjavascriptcoregtk-4.0-dev libwebkit2gtk-4.0-dev
     - name: Check
       run: cargo check --verbose
     - name: Run tests
@@ -68,18 +48,8 @@ jobs:
       run: rustup update nightly && rustup default nightly
     - name: Setup formatter
       run: rustup component add rustfmt --toolchain nightly
-    - name: Install gdk-3.0
-      run: sudo apt install -y libgdk3.0-cil-dev
-    - name: Install libsoup2
-      run: sudo apt install -y libsoup2.4-dev
-    - name: Install libjavascriptcoregtk
-      run: sudo apt install -y libjavascriptcoregtk-4.0-dev
-    - name: Install libwebkit2gtk
-      run: sudo apt install -y libwebkit2gtk-4.0-dev
-    - name: Install librsvg2
-      run: sudo apt install -y librsvg2-dev
-    - name: Install libssl
-      run: sudo apt install -y libssl-dev
+    - name: Install dependencies
+      run: sudo apt-get install --no-install-recommends -y libgdk3.0-cil-dev libsoup2.4-dev libjavascriptcoregtk-4.0-dev libwebkit2gtk-4.0-dev
     - name: Check
       run: cargo check --verbose
     - name: Run tests

diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml
@@ -18,18 +18,8 @@ jobs:
     - uses: actions/checkout@v3
     - name: Setup compiler
       run: rustup update stable && rustup default stable
-    - name: Install gdk-3.0
-      run: sudo apt install -y libgdk3.0-cil-dev
-    - name: Install libsoup2
-      run: sudo apt install -y libsoup2.4-dev
-    - name: Install libjavascriptcoregtk
-      run: sudo apt install -y libjavascriptcoregtk-4.0-dev
-    - name: Install libwebkit2gtk
-      run: sudo apt install -y libwebkit2gtk-4.0-dev
-    - name: Install librsvg2
-      run: sudo apt install -y librsvg2-dev
-    - name: Install libssl
-      run: sudo apt install -y libssl-dev
+    - name: Install dependencies
+      run: sudo apt-get install --no-install-recommends -y libgdk3.0-cil-dev libsoup2.4-dev libjavascriptcoregtk-4.0-dev libwebkit2gtk-4.0-dev
     - name: Check
       run: cargo check --release --verbose
     - name: Run tests

diff --git a/.github/workflows/lint-gui.yml b/.github/workflows/lint-gui.yml
@@ -32,12 +32,10 @@ jobs:
         shell: bash
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-      - name: Enter GUI directory
-        run: cd src/gui
       - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+        run: cd src/gui && pnpm install --frozen-lockfile
       - name: Lint with Next.js 
-        run: pnpm lint
+        run: cd src/gui && pnpm lint
   build:
     runs-on: ubuntu-latest