workflow: update runner to ubuntu-24.04

themactep · May 16, 2024 · acf1de7 · acf1de7
1 parent 25e56d5
commit acf1de7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 61 deletions.
diff --git a/.github/workflows/build-cache-1.yaml b/.github/workflows/build-cache-1.yaml
@@ -27,7 +27,7 @@ env:
 
 jobs:
   notify-begin:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       start_time: ${{ steps.set_output.outputs.time }}
     steps:
@@ -49,7 +49,7 @@ jobs:
   build-caches:
     name: ${{ matrix.caches-version }}
     needs: notify-begin
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -88,19 +88,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-dl-shared-v1-${{ env.CURRENT_YEAR }}-week-
 
-      - name: Setup repo sources for GCC13
-        run: |
-          sudo echo "deb http://archive.ubuntu.com/ubuntu/ lunar main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
-          sudo tee -a /etc/apt/preferences.d/prefer-jammy <<EOF
-          Package: *
-          Pin: release a=jammy
-          Pin-Priority: 500
-
-          Package: *
-          Pin: release a=lunar
-          Pin-Priority: 100
-          EOF
-
       - name: Update system sources
         run: |
           sudo apt-get update
@@ -109,10 +96,6 @@ jobs:
         run: |
           sudo apt-get install -y --no-install-recommends --no-install-suggests build-essential bc bison cpio curl file flex git libncurses-dev make rsync unzip wget whiptail gcc gcc-mipsel-linux-gnu lzop u-boot-tools ca-certificates ccache
 
-      - name: Install GCC13 dependencies
-        run: |
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests libc6=2.37-0ubuntu2 libc-bin=2.37-0ubuntu2 libc6-mipsel-cross=2.37-0ubuntu1cross1 libc6-dev=2.37-0ubuntu2 libc-dev-bin=2.37-0ubuntu2 coreutils=9.1-1ubuntu2 libgmp10=2:6.2.1+dfsg1-1.1ubuntu1
-
       - name: Generate buildroot cache
         run: |
           BOARD=${{ matrix.caches-version }} make
@@ -150,7 +133,7 @@ jobs:
 
   notify-completion:
     needs: [build-caches, notify-begin]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: always()
     steps:
       - name: Send completion summary

diff --git a/.github/workflows/firmware-module.yaml b/.github/workflows/firmware-module.yaml
@@ -38,7 +38,7 @@ env:
 
 jobs:
   notify-begin:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       start_time: ${{ steps.set_output.outputs.time }}
       tg_disabled: ${{ steps.set_env.outputs.tg_disabled }}
@@ -65,7 +65,7 @@ jobs:
           echo Telegram response: ${HTTP}
 
   generate-matrix:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -94,7 +94,7 @@ jobs:
   buildroot:
     name: ${{ matrix.thingino-version }}
     needs: [generate-matrix, notify-begin]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix: ${{fromJson(needs.generate-matrix.outputs.matrix)}}
@@ -143,19 +143,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-dl-shared-v1-${{ env.CURRENT_YEAR }}-week-
 
-      - name: Setup repo sources for GCC13
-        run: |
-          sudo echo "deb http://archive.ubuntu.com/ubuntu/ lunar main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
-          sudo tee -a /etc/apt/preferences.d/prefer-jammy <<EOF
-          Package: *
-          Pin: release a=jammy
-          Pin-Priority: 500
-
-          Package: *
-          Pin: release a=lunar
-          Pin-Priority: 100
-          EOF
-
       - name: Update APT sources
         run: |
           sudo apt-get update
@@ -164,10 +151,6 @@ jobs:
         run: |
           sudo apt-get install -y --no-install-recommends --no-install-suggests build-essential bc bison cpio curl file flex git libncurses-dev make rsync unzip wget whiptail gcc gcc-mipsel-linux-gnu lzop u-boot-tools ca-certificates ccache python3-numpy python3-matplotlib
 
-      - name: Install GCC13 dependencies
-        run: |
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests libc6=2.37-0ubuntu2 libc-bin=2.37-0ubuntu2 libc6-mipsel-cross=2.37-0ubuntu1cross1 libc6-dev=2.37-0ubuntu2 libc-dev-bin=2.37-0ubuntu2 coreutils=9.1-1ubuntu2 libgmp10=2:6.2.1+dfsg1-1.1ubuntu1
-
       - name: Build firmware
         run: |
           BOARD=${{ matrix.thingino-version }} make
@@ -286,7 +269,7 @@ jobs:
 
   notify-completion:
     needs: [buildroot, notify-begin]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: always()
     steps:
       - name: Setup Environment

diff --git a/.github/workflows/toolchain.yaml b/.github/workflows/toolchain.yaml
@@ -27,7 +27,7 @@ env:
 
 jobs:
   notify-begin:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       start_time: ${{ steps.set_output.outputs.time }}
     steps:
@@ -49,7 +49,7 @@ jobs:
   build-toolchain:
     name: ${{ matrix.toolchain-version }}
     needs: notify-begin
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -101,19 +101,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-dl-shared-v1-${{ env.CURRENT_YEAR }}-week-
 
-      - name: Setup repo sources for GCC13
-        run: |
-          sudo echo "deb http://archive.ubuntu.com/ubuntu/ lunar main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
-          sudo tee -a /etc/apt/preferences.d/prefer-jammy <<EOF
-          Package: *
-          Pin: release a=jammy
-          Pin-Priority: 500
-
-          Package: *
-          Pin: release a=lunar
-          Pin-Priority: 100
-          EOF
-
       - name: Update system sources
         run: |
           sudo apt-get update
@@ -122,10 +109,6 @@ jobs:
         run: |
           sudo apt-get install -y --no-install-recommends --no-install-suggests build-essential bc bison cpio curl file flex git libncurses-dev make rsync unzip wget whiptail gcc gcc-mipsel-linux-gnu lzop u-boot-tools ca-certificates ccache
 
-      - name: Install GCC13 dependencies
-        run: |
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests libc6=2.37-0ubuntu2 libc-bin=2.37-0ubuntu2 libc6-mipsel-cross=2.37-0ubuntu1cross1 libc6-dev=2.37-0ubuntu2 libc-dev-bin=2.37-0ubuntu2 coreutils=9.1-1ubuntu2 libgmp10=2:6.2.1+dfsg1-1.1ubuntu1
-
       - name: Build toolchain
         run: |
           BOARD=${{ matrix.toolchain-version }} make sdk
@@ -189,7 +172,7 @@ jobs:
 
   notify-completion:
     needs: [build-toolchain, notify-begin]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: always()
     steps:
       - name: Send completion summary