FIXUP: Re-add tesseract path

fixup! Drop Ubuntu 20.04 (Focal) support
2025-05-15 09:41:49 +02:00 · 2025-03-11 10:59:29 +02:00 · 2025-03-10 23:36:49 +02:00 · 2025-03-10 23:24:43 +02:00 · 2025-03-10 23:14:15 +02:00 · 2025-03-10 23:10:56 +02:00
2 changed files with 7 additions and 21 deletions
--- a/.github/workflows/scan.yml
+++ b/.github/workflows/scan.yml
@ -10,12 +10,7 @@ on:

 jobs:
  security-scan-container:
-    strategy:
-      matrix:
-        runs-on:
-          - ubuntu-24.04
-          - ubuntu-24.04-arm
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@ -63,12 +58,7 @@ jobs:
          severity-cutoff: critical

  security-scan-app:
-    strategy:
-      matrix:
-        runs-on:
-          - ubuntu-24.04
-          - ubuntu-24.04-arm
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout
        uses: actions/checkout@v4
--- a/.github/workflows/scan_released.yml
+++ b/.github/workflows/scan_released.yml
@ -9,10 +9,11 @@ jobs:
    strategy:
      matrix:
        include:
-          - runs-on: ubuntu-24.04
+          - runs-on: ubuntu-latest
            arch: i686
-          - runs-on: ubuntu-24.04-arm
-            arch: arm64
+          # Do not scan Silicon mac for now to avoid masking release scan results for other plaforms.
+          # - runs-on: macos-latest
+          #   arch: arm64
    runs-on: ${{ matrix.runs-on }}
    steps:
      - name: Checkout
@ -54,12 +55,7 @@ jobs:
          severity-cutoff: critical

  security-scan-app:
-    strategy:
-      matrix:
-        runs-on:
-          - ubuntu-24.04
-          - ubuntu-24.04-arm
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout
        uses: actions/checkout@v4
Author	SHA1	Message	Date
Alex Pyrgiotis	11fa8ab7a8	FIXUP: Re-add tesseract path	2025-03-11 10:59:29 +02:00
Alex Pyrgiotis	d9a714b793	fixup! Drop Ubuntu 20.04 (Focal) support	2025-03-10 23:36:49 +02:00
Alex Pyrgiotis	606efa7ea2	fixup! Drop Ubuntu 20.04 (Focal) support	2025-03-10 23:24:43 +02:00
Alex Pyrgiotis	47bc5cdb4a	Use correct Ubuntu version for conmon notice	2025-03-10 23:14:15 +02:00
Alex Pyrgiotis	603fe86f4a	Unpin the Debian-vendored PyMuPDF package Unpin the PyMuPDF package that we vendor in our Debian packages. We originally pinned it to version 1.24.11, because it was the last version that supported Ubuntu Focal, but we can now unpin it, since we have dropped Ubuntu Focal support. Fixes #1018	2025-03-10 23:10:56 +02:00
Alex Pyrgiotis	5995d01959	Drop Ubuntu 20.04 (Focal) support Drop Ubuntu 20.04 (Focal) support, because it's nearing its end-of-life date. By doing so, we can remove several workarounds and notices we had in place for this version, and most importantly, remove the pin to our vendored PyMuPDF package. Refs #1018 Refs #965	2025-03-10 23:07:37 +02:00