Skip to content

Update runner image to the latest ubuntu #3450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
a-b merged 1 commit into from
Mar 11, 2025
Merged

Update runner image to the latest ubuntu #3450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions .github/workflows/release-build-sign-upload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
name: Build Linux
needs:
- setup
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

env:
VERSION_BUILD: ${{ needs.setup.outputs.version-build }}
Expand Down Expand Up @@ -311,7 +311,7 @@ jobs:
cp ../completion/cf${VERSION_MAJOR} cf/usr/share/bash-completion/completions/cf${VERSION_MAJOR}
cp $root/out/cf-cli_linux_i686 cf/usr/bin/cf${VERSION_MAJOR}
ln -frs cf/usr/bin/cf${VERSION_MAJOR} cf/usr/bin/cf
fakeroot dpkg --build cf cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_i686.deb
fakeroot dpkg-deb -Zxz --build cf cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_i686.deb
mv cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_i686.deb $root/packaged-deb
rm -rf cf
popd
Expand All @@ -336,7 +336,7 @@ jobs:
cp ../completion/cf${VERSION_MAJOR} cf/usr/share/bash-completion/completions/cf${VERSION_MAJOR}
cp $root/out/cf-cli_linux_x86-64 cf/usr/bin/cf${VERSION_MAJOR}
ln -frs cf/usr/bin/cf${VERSION_MAJOR} cf/usr/bin/cf
fakeroot dpkg --build cf cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_x86-64.deb
fakeroot dpkg-deb -Zxz --build cf cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_x86-64.deb
mv cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_x86-64.deb $root/packaged-deb
popd
)
Expand All @@ -360,7 +360,7 @@ jobs:
cp ../completion/cf${VERSION_MAJOR} cf/usr/share/bash-completion/completions/cf${VERSION_MAJOR}
cp $root/out/cf-cli_linux_arm64 cf/usr/bin/cf${VERSION_MAJOR}
ln -frs cf/usr/bin/cf${VERSION_MAJOR} cf/usr/bin/cf
fakeroot dpkg --build cf cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_arm64.deb
fakeroot dpkg-deb -Zxz --build cf cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_arm64.deb
mv cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_arm64.deb $root/packaged-deb
popd
)
Expand Down Expand Up @@ -905,20 +905,29 @@ jobs:
needs:
- setup
- build-linux
runs-on: ubuntu-20.04
container:
image: ubuntu:20.04
runs-on: ubuntu-latest
steps:

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

- name: Display structure of downloaded files
- name: Display structure of downloaded files and test compression
run: |
ls -R

for i in debian:11 debian:12 ubuntu:20.04 ubuntu:22.04 ubuntu; do docker run \
Copy link
Contributor

@Samze Samze Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question I dont have context on the compression issue, but how does this test it?

Copy link
Member Author

@a-b a-b Mar 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dpkg --info fails when trying to open a .deb file with unsupported compression.

Copy link
Member Author

@a-b a-b Mar 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple examples:

Copy link
Contributor

@joaopapereira joaopapereira Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use the matrix strategy here to change the container image? instead of this for loop?

Copy link
Member Author

@a-b a-b Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call. Yes, we should use matrix!

Copy link
Contributor

@Samze Samze Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool thanks

Copy link
Member Author

@a-b a-b Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created a follow-up PR for v8 #3451 and added commit to the main PR #3449

--interactive \
--rm \
-v .:/workspace \
${i:?} <<EOC
printf "${i:?} -> "
grep PRETTY_NAME /etc/os-release | cut -d= -f2-
cd workspace
ls *.deb | xargs -n1 dpkg --info
EOC
done

test-macos:
name: Test macOS Artifacts
Expand Down Expand Up @@ -1069,4 +1078,4 @@ jobs:

git push
fi
popd
popd
7 changes: 2 additions & 5 deletions .github/workflows/release-update-repos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ jobs:

update-deb:
name: Update Debian Repository
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
needs: setup
env:
CLAW_URL: ${{ needs.setup.outputs.claw-url }}
Expand Down Expand Up @@ -305,10 +305,7 @@ jobs:

test-deb:
name: Test Debian Repository
strategy:
matrix:
os: [ubuntu-22.04, ubuntu-latest]
runs-on: ${{ matrix.os }}
runs-on: ubuntu-latest
needs:
- setup
- update-deb
Expand Down
Loading