Skip to content
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

CI: add a step which uninstalls all potentially left over packages #87

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
+17 −0
Draft

CI: add a step which uninstalls all potentially left over packages #87

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4b2808
CI: add a step which uninstalls all potentially left over packages
lazka May 22, 2024
ae1e311
keep more packages
lazka May 22, 2024
f7c1994
add toolchain
lazka May 22, 2024
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
17 changes: 17 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,23 @@ jobs:
msys2 -c 'pacman --noconfirm -Suu'
msys2 -c 'pacman -Qkq'

- name: Remove potentially left over packages
if: ${{ runner.arch == 'ARM64' }}
shell: msys2 {0}
run: |
# Remove everything not needed
# XXX: this depends on marix.packages just being base+base-devel
KEEP=("base" "base-devel")
# https://github.com/msys2/msys2-autobuild/pull/87#issuecomment-2125614088
KEEP+=($(pacman -Sgq mingw-w64-clang-aarch64-toolchain) "zip" "unzip" "vim" "etc-update" "psmisc")
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
KEEP+=($(pacman -Sgq mingw-w64-clang-aarch64-toolchain) "zip" "unzip" "vim" "etc-update" "psmisc")
KEEP+=($(pacman -Sgq mingw-w64-clang-aarch64-toolchain) "vim" "etc-update" "procps-ng" "psmisc")

pacman -S --noconfirm --needed "${KEEP[@]}"
TO_REMOVE=$(comm -23 <(pacman -Qq | sort) <(for tokeep in "${KEEP[@]}"; do pactree -ul "$tokeep" | sed 's/[<>=].*//'; done | sort -u))
Copy link
Member

@jeremyd2019 jeremyd2019 May 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
TO_REMOVE=$(comm -23 <(pacman -Qq | sort) <(for tokeep in "${KEEP[@]}"; do pactree -ul "$tokeep" | sed 's/[<>=].*//'; done | sort -u))
TO_REMOVE=$(comm -23 <(pacman -Qq | sort) <(pacman -Qq $(for tokeep in "${KEEP[@]}"; do pactree -ul "$tokeep" | sed 's/[<>=].*//'; done) | sort -u))

? pacman -Qq seems to resolve provides to the "real" package name.

Copy link
Member

Choose a reason for hiding this comment

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

Also I don't know if sort -u should be inside the $() subshell too, or just at the end. I originally had it just inside, and comm was then unhappy that its input was not sorted anymore.

if [[ -n "$TO_REMOVE" ]]; then
pacman --noconfirm -Rddn $TO_REMOVE
# This shouldn't install anything, but just in case
pacman -S --noconfirm --needed ${{ matrix.packages }} "${KEEP[@]}"
fi

- name: Process build queue
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down