Merge branch 'master' into create-workflow-linter-pipeline

Screenly · Jan 23, 2025 · 79a194e · 79a194e
2 parents 89adbe9 + 40100b8
commit 79a194e
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/ansible-lint.yaml b/.github/workflows/ansible-lint.yaml
@@ -17,7 +17,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/build-balena-disk-image.yaml b/.github/workflows/build-balena-disk-image.yaml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         board: ['pi1', 'pi2', 'pi3', 'pi4', 'pi5']
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: write
       id-token: write

diff --git a/.github/workflows/build-webview.yaml b/.github/workflows/build-webview.yaml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   build-docker-image:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -53,7 +53,7 @@ jobs:
     strategy:
       matrix:
         board: ['pi1', 'pi2', 'pi3', 'pi4']
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml
@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     permissions:
       actions: read

diff --git a/.github/workflows/deploy-website.yaml b/.github/workflows/deploy-website.yaml
@@ -55,7 +55,7 @@ jobs:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
     steps:
       - name: Deploy to GitHub Pages

diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
@@ -31,7 +31,7 @@ jobs:
       matrix:
         board: ['pi1', 'pi2', 'pi3', 'pi4', 'pi4-64', 'pi5', 'x86']
         python-version: ["3.11"]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -102,7 +102,7 @@ jobs:
     strategy:
       matrix:
         board: ['pi1', 'pi2', 'pi3', 'pi4', 'pi5']
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
@@ -27,7 +27,7 @@ on:
 
 jobs:
   run-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         python-version: ["3.11"]

diff --git a/.github/workflows/generate-openapi-schema.yml b/.github/workflows/generate-openapi-schema.yml
@@ -51,7 +51,7 @@ on:
 
 jobs:
   generate-openapi-schema:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/javascript-lint.yaml b/.github/workflows/javascript-lint.yaml
@@ -18,7 +18,7 @@ on:
 
 jobs:
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
@@ -32,4 +32,4 @@ jobs:
         run: npm ci
 
       - name: Run ESLint
-        run: npm run lint
+        run: npm run lint
diff --git a/.github/workflows/python-lint.yaml b/.github/workflows/python-lint.yaml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   run-python-linter:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         python-version: ["3.11"]

diff --git a/.github/workflows/sbom.yaml b/.github/workflows/sbom.yaml
@@ -14,7 +14,7 @@ jobs:
 
   js-sbom:
     needs: run-tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       id-token: write
       contents: read
@@ -41,7 +41,7 @@ jobs:
 
   python-sbom:
     needs: run-tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       id-token: write
       contents: read

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -5,7 +5,7 @@ cffi==1.14.4
 configparser==4.0.2
 cryptography==3.3.2
 Cython==0.29.33
-Django==4.2.17
+Django==4.2.18
 djangorestframework==3.15.2
 django-dbbackup==4.2.1
 drf-spectacular==0.27.2

diff --git a/requirements/requirements.viewer.txt b/requirements/requirements.viewer.txt
@@ -5,7 +5,7 @@ certifi==2024.7.4
 configparser==4.0.2
 cryptography==3.3.2
 Cython==0.29.33
-Django==4.2.17
+Django==4.2.18
 django-dbbackup==4.2.1
 drf-spectacular==0.27.2
 future==0.18.3
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ on: @@
     jobs:
       build:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-24.04
         steps:
           - uses: actions/checkout@v4
@@ Expand Down @@