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

mingw-w64-git: use /proc/cygdrive prefix in bin path when installing redirectors #125

Merged
merged 2 commits into from
Jul 19, 2024
Merged

mingw-w64-git: use /proc/cygdrive prefix in bin path when installing redirectors #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22fcdb3
Revert "ci: implement a (temporary) workaround to help switching to `…
dscho Jul 19, 2024
3e9184f
mingw-w64-git: use /proc/cygdrive prefix in bin path when installing …
A2uria Jul 19, 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
18 changes: 0 additions & 18 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,24 +59,6 @@ jobs:
# reduce time required to install packages by disabling pacman's disk space checking
sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf &&

# help git-sdk-arm64 switch from `asciidoc` to `asciidoctor`
if test mingw-w64-git = '${{ matrix.directory }}'
then
packages=$(ls -d /var/lib/pacman/local/mingw-w64-*-asciidoctor-extensions-* 2>/dev/null |
sed -e 's|-[0-9].*||' -e 's|.*/||')
if test -n "$packages"
then
pacman -R --noconfirm $packages
fi &&
for prefix in /mingw32 /mingw64 /clangarm64
do
if test -x $prefix/bin/gem
then
PATH=$prefix/bin:$PATH gem uninstall asciidoctor
fi
done
fi &&

top_dir=$PWD &&
cd "${{ matrix.directory }}" &&
MAKEFLAGS=-j8 makepkg-mingw -s --noconfirm &&
Expand Down
2 changes: 1 addition & 1 deletion mingw-w64-git/git.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ mingw_prefix_path () {
}

bin_path () {
echo "$(cygpath -am / | sed 's/^\([A-Z]\):/\/\1/')/bin"
echo "$(cygpath -am / | sed 's/^\([A-Z]\):/\/proc\/cygdrive\/\1/')/bin"
}

copy_files () {
Expand Down