chg: test workaround for bionic key error, cleanup GH action versions

Signed-off-by: Stephen Arnold <[email protected]>
VCTLabs · Nov 5, 2024 · 8fbed67 · 8fbed67
1 parent d3bf049
commit 8fbed67
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,13 +12,13 @@ jobs:
       run:
         shell: bash
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         include:
-          #- dist: ubuntu
-            #suite: bionic
-            #major: 18
-            #arch: arm64
+          - dist: ubuntu
+            suite: bionic
+            major: 18
+            arch: arm64
           - dist: ubuntu
             suite: focal
             major: 20
@@ -48,14 +48,15 @@ jobs:
         run: |
           sudo apt-get -qq update
           sudo apt-get install -y debootstrap qemu-user-static binfmt-support
+          sudo apt-get install -yqq ubuntu-keyring ubuntu-archive-keyring debian-keyring debian-archive-keyring
 
       - name: Build image
         run: |
           ./.github/ci_build.sh ${{ matrix.dist }} ${{ matrix.suite }}
           ls -lh deploy/
 
       - name: Upload image
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.dist }}-${{ matrix.suite }}-${{ matrix.arch }}
           path: deploy/${{ matrix.dist }}-${{ matrix.major }}*${{ matrix.arch }}*.tar.xz
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -43,6 +43,7 @@ jobs:
         with:
           repository: CirrusLogic/linux-firmware
           path: git/linux-firmware
+          ref: cs35l56-20241031
 
       - name: Common dependencies
         run: |
@@ -55,7 +56,7 @@ jobs:
           ls -lh deploy/
 
       - name: Upload image
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: rootfs
           path: deploy/${{ matrix.dist }}-${{ matrix.major }}*${{ matrix.arch }}*.tar.xz
@@ -72,21 +73,21 @@ jobs:
           echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
           echo ${{ env.VERSION }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       # download all artifacts to project dir
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
 
       - name: Generate changes file
-        uses: sarnold/gitchangelog-action@master
+        uses: sarnold/gitchangelog-action@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN}}
 
       - name: Create release
         id: create_release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/scripts/debootstrap.sh b/scripts/debootstrap.sh
@@ -70,6 +70,9 @@ check_defines () {
 		exit 1
 	else
 		suite="${deb_codename}"
+		if [ "x${deb_codename}" = "xbionic" ] ; then
+			options="${options} --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg"
+		fi
 	fi
 
 	case "${deb_distribution}" in