Update GitHub Action workflows for new runner

arkq · Jul 8, 2023 · 3a75712 · 3a75712
1 parent aae37b7
commit 3a75712
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 24 deletions.
diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os:
-        - ubuntu-18.04
+        - ubuntu-20.04
         - ubuntu-latest
         features:
         - --enable-debug --enable-manpages
@@ -17,13 +17,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - name: Install Dependencies
-      run: |
-        sudo apt update
-        sudo apt install --yes --quiet --no-install-recommends \
-          libcurl4-openssl-dev \
-          libnotify-dev \
-          python-docutils
-    - uses: actions/checkout@v2
+      uses: awalsh128/cache-apt-pkgs-action@v1
+      with:
+        packages: >
+          libcurl4-openssl-dev
+          libnotify-dev
+          python3-docutils
+    - uses: actions/checkout@v3
     - name: Create Build Environment
       run: |
         mkdir -p ${{ github.workspace }}/build

diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml
@@ -3,29 +3,25 @@ on:
   push:
   pull_request:
     branches: [ master ]
+permissions:
+  actions: read
+  contents: read
+  security-events: write
 jobs:
   analyze:
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-    strategy:
-      matrix:
-        language: [ 'cpp' ]
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
     - name: Install Dependencies
-      run: |
-        sudo apt update
-        sudo apt install --yes --quiet --no-install-recommends \
-          libcurl4-openssl-dev \
+      uses: awalsh128/cache-apt-pkgs-action@v1
+      with:
+        packages: >
+          libcurl4-openssl-dev
           libnotify-dev
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
-        languages: ${{ matrix.language }}
+        languages: cpp
         queries: security-and-quality
     - name: Create Build Environment
       run: |
@@ -40,4 +36,4 @@ jobs:
       working-directory: ${{ github.workspace }}/build
       run: make
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2