Skip to content

Commit

Permalink
CI: Fix inner directory name of recompressed tarball
Browse files Browse the repository at this point in the history
  • Loading branch information
networkException committed Jul 29, 2024
1 parent d1ed818 commit 5f37082
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jobs:
SOURCE_TARBALL_URL="$(su -c "makepkg --printsrcinfo" makepkg | grep commondatastorage.googleapis.com | awk '{ print $3 }')"
SOURCE_TARBALL_FILENAME="$(echo "$SOURCE_TARBALL_URL" | awk -F'/' '{ print $NF }')"
SOURCE_TARBALL_INNER_DIRECTORY_NAME="$(echo "$SOURCE_TARBALL_FILENAME" | sed 's/.tar.xz//')"
SOURCE_TARBALL_CHECKSUM="$(su -c "makepkg --printsrcinfo" makepkg | grep sha256sums -m 1 | awk '{ print $3 }')"
# Taken from https://github.com/NixOS/nixpkgs/blob/7a14a916f856dc4acda391a9febc3bfb37f2a732/pkgs/applications/networking/browsers/chromium/recompress-tarball.nix#L31-L54
Expand All @@ -97,7 +98,9 @@ jobs:
--exclude=third_party/rust-toolchain \
--exclude=third_party/instrumented_libs \
--strip-components=1 \
--one-top-level=source
--one-top-level="$SOURCE_TARBALL_INNER_DIRECTORY_NAME"
https://commondatastorage.googleapis.com/chromium-browser-official/chromium-127.0.6533.72.tar.xz
tar \
--use-compress-program "zstd -T0" \
Expand All @@ -106,7 +109,7 @@ jobs:
--owner=root --group=root \
--numeric-owner --mode=go=rX,u+rw,a-s \
--remove-files \
-cf "$SOURCE_TARBALL_FILENAME" source
-cf "$SOURCE_TARBALL_FILENAME" "$SOURCE_TARBALL_INNER_DIRECTORY_NAME"
RECOMPRESSED_TARBALL_CHECKSUM="$(sha256sum "$SOURCE_TARBALL_FILENAME" | awk '{ print $1 }')"
Expand Down
2 changes: 1 addition & 1 deletion PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

pkgname=ungoogled-chromium
pkgver=127.0.6533.72
pkgrel=3
pkgrel=4
_launcher_ver=8
_system_clang=1
# ungoogled chromium variables
Expand Down

0 comments on commit 5f37082

Please sign in to comment.