Skip to content

Commit bccdffb

Browse files
committed
build-and-deploy: drop work around for cURL v8.11.0
When deploying curl-8.11.0-2, a problem needed to be worked around: that cURL version, v8.11.0, had a bug that needed to be fixed, but the fix could not be deployed because of that bug. To work around this problem, the `build-and-deploy` workflow needed to force-downgrade the `curl` package. This workaround is no longer needed, therefore we can drop it. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent d00bc96 commit bccdffb

File tree

1 file changed

+0
-24
lines changed

1 file changed

+0
-24
lines changed

.github/workflows/build-and-deploy.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -105,30 +105,6 @@ jobs:
105105
architecture: ${{ env.ARCHITECTURE || 'x86_64' }}
106106
msys: ${{ env.REPO == 'MSYS2-packages' || env.PACKAGE_TO_BUILD == 'git-for-windows-keyring' }}
107107

108-
- name: work around curl v8.11.0-1 problem
109-
if: env.PACKAGE_TO_BUILD == 'curl' && env. REF == 'd58b04ae4163fe6c6c25b330bea0930d7bb627ac'
110-
shell: bash
111-
run: |
112-
# `git fetch` does not work with that libcurl version. For details,
113-
# see https://github.com/git-for-windows/MSYS2-packages/pull/199
114-
test ! -f /var/lib/pacman/local/libcurl-8.11.0-1/desc ||
115-
for pkg in libcurl curl
116-
do
117-
case "$ARCHITECTURE" in
118-
i686) url=https://wingit.blob.core.windows.net/i686/$pkg-8.10.1-1-i686.pkg.tar.xz;;
119-
x86_64) url=https://wingit.blob.core.windows.net/x86-64/$pkg-8.10.1-1-x86_64.pkg.tar.xz;;
120-
esac
121-
for suffix in '' .sig
122-
do
123-
curl --retry 5 -fLO $url$suffix || exit 1
124-
done
125-
pacman -U --noconfirm ${url##*/} || exit 1
126-
done
127-
128-
# Sadly, this does not work because the Pacman repository's index only
129-
# ever lists the latest package version:
130-
# pacman -S --noconfirm libcurl=8.10.1-1 curl=8.10.1-1
131-
132108
- name: Clone ${{ env.REPO }}
133109
shell: bash
134110
run: |

0 commit comments

Comments
 (0)