Skip to content

Commit c0bc8b6

Browse files
a-bjoaopapereiraxandroc
authored
Update image to the latest ubuntu (#3450)
- Use dpkg-deb -Zxz to keep backward compatibility - Improve test to check compatibility with Deb OSes Co-authored-by: João Pereira <[email protected]> Co-authored-by: Alex Rocha <[email protected]>
1 parent 8439d20 commit c0bc8b6

File tree

2 files changed

+20
-14
lines changed

2 files changed

+20
-14
lines changed

.github/workflows/release-build-sign-upload.yml

+18-9
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
name: Build Linux
115115
needs:
116116
- setup
117-
runs-on: ubuntu-20.04
117+
runs-on: ubuntu-latest
118118

119119
env:
120120
VERSION_BUILD: ${{ needs.setup.outputs.version-build }}
@@ -311,7 +311,7 @@ jobs:
311311
cp ../completion/cf${VERSION_MAJOR} cf/usr/share/bash-completion/completions/cf${VERSION_MAJOR}
312312
cp $root/out/cf-cli_linux_i686 cf/usr/bin/cf${VERSION_MAJOR}
313313
ln -frs cf/usr/bin/cf${VERSION_MAJOR} cf/usr/bin/cf
314-
fakeroot dpkg --build cf cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_i686.deb
314+
fakeroot dpkg-deb -Zxz --build cf cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_i686.deb
315315
mv cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_i686.deb $root/packaged-deb
316316
rm -rf cf
317317
popd
@@ -336,7 +336,7 @@ jobs:
336336
cp ../completion/cf${VERSION_MAJOR} cf/usr/share/bash-completion/completions/cf${VERSION_MAJOR}
337337
cp $root/out/cf-cli_linux_x86-64 cf/usr/bin/cf${VERSION_MAJOR}
338338
ln -frs cf/usr/bin/cf${VERSION_MAJOR} cf/usr/bin/cf
339-
fakeroot dpkg --build cf cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_x86-64.deb
339+
fakeroot dpkg-deb -Zxz --build cf cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_x86-64.deb
340340
mv cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_x86-64.deb $root/packaged-deb
341341
popd
342342
)
@@ -360,7 +360,7 @@ jobs:
360360
cp ../completion/cf${VERSION_MAJOR} cf/usr/share/bash-completion/completions/cf${VERSION_MAJOR}
361361
cp $root/out/cf-cli_linux_arm64 cf/usr/bin/cf${VERSION_MAJOR}
362362
ln -frs cf/usr/bin/cf${VERSION_MAJOR} cf/usr/bin/cf
363-
fakeroot dpkg --build cf cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_arm64.deb
363+
fakeroot dpkg-deb -Zxz --build cf cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_arm64.deb
364364
mv cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_arm64.deb $root/packaged-deb
365365
popd
366366
)
@@ -905,20 +905,29 @@ jobs:
905905
needs:
906906
- setup
907907
- build-linux
908-
runs-on: ubuntu-20.04
909-
container:
910-
image: ubuntu:20.04
908+
runs-on: ubuntu-latest
911909
steps:
912910

913911
- name: Download Signed Linux Packages
914912
uses: actions/download-artifact@v4
915913
with:
916914
name: cf-cli-linux-deb-packages
917915

918-
- name: Display structure of downloaded files
916+
- name: Display structure of downloaded files and test compression
919917
run: |
920918
ls -R
919+
920+
for i in debian:11 debian:12 ubuntu:20.04 ubuntu:22.04 ubuntu; do docker run \
921+
--interactive \
922+
--rm \
923+
-v .:/workspace \
924+
${i:?} <<EOC
925+
printf "${i:?} -> "
926+
grep PRETTY_NAME /etc/os-release | cut -d= -f2-
927+
cd workspace
921928
ls *.deb | xargs -n1 dpkg --info
929+
EOC
930+
done
922931
923932
test-macos:
924933
name: Test macOS Artifacts
@@ -1069,4 +1078,4 @@ jobs:
10691078
10701079
git push
10711080
fi
1072-
popd
1081+
popd

.github/workflows/release-update-repos.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ jobs:
233233
234234
update-deb:
235235
name: Update Debian Repository
236-
runs-on: ubuntu-20.04
236+
runs-on: ubuntu-latest
237237
needs: setup
238238
env:
239239
CLAW_URL: ${{ needs.setup.outputs.claw-url }}
@@ -305,10 +305,7 @@ jobs:
305305
306306
test-deb:
307307
name: Test Debian Repository
308-
strategy:
309-
matrix:
310-
os: [ubuntu-22.04, ubuntu-latest]
311-
runs-on: ${{ matrix.os }}
308+
runs-on: ubuntu-latest
312309
needs:
313310
- setup
314311
- update-deb

0 commit comments

Comments
 (0)