Skip to content

Commit

Permalink
chore(cd): build ubuntu jammy artifacts in docker (#13212)
Browse files Browse the repository at this point in the history
Github runner's "ubuntu-latest" will be bumped to ubuntu 24.04, thus build outside of docker results in artifacts targeting 24.04.

(cherry picked from commit 8fdfb46)
  • Loading branch information
fffonion authored and Water-Melon committed Jun 21, 2024
1 parent d7a25df commit 1db95a9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/matrix-commitly.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# please see matrix-full.yml for meaning of each field
build-packages:
- label: ubuntu-22.04
os: ubuntu-22.04
image: ubuntu:22.04
package: deb
check-manifest-suite: ubuntu-22.04-amd64

Expand Down
2 changes: 2 additions & 0 deletions .github/matrix-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ build-packages:
package: deb
check-manifest-suite: ubuntu-20.04-amd64
- label: ubuntu-22.04
image: ubuntu:22.04
package: deb
check-manifest-suite: ubuntu-22.04-amd64
- label: ubuntu-22.04-arm64
image: ubuntu:22.04
package: deb
bazel-args: --platforms=//:generic-crossbuild-aarch64
check-manifest-suite: ubuntu-22.04-arm64
Expand Down
7 changes: 5 additions & 2 deletions scripts/explain_manifest/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,12 @@ def gather_files(path: str, image: str):
code = os.system(
"ar p %s data.tar.gz | tar -C %s -xz" % (path, t.name))
elif ext == ".rpm":
# GNU cpio and rpm2cpio is needed
# rpm2cpio is needed
# rpm2archive ships with rpm2cpio on debians
code = os.system(
"rpm2cpio %s | cpio --no-preserve-owner --no-absolute-filenames -idm -D %s" % (path, t.name))
"""
rpm2archive %s && tar -C %s -xf %s.tgz
""" % (path, t.name, path))
elif ext == ".gz":
code = os.system("tar -C %s -xf %s" % (t.name, path))

Expand Down

0 comments on commit 1db95a9

Please sign in to comment.