From f72402ce1e7573b52235a99ce872ff1c4f69fea6 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 27 Feb 2025 15:10:18 +0000 Subject: [PATCH] CI: Fetch a different URL on sourceforge.net Commit a56de468 "CI: Avoid using a no-op download location that gives a 403 error" changed this, but now the direct URL to the file *also* gives a 403 error. According to the comments in this file, the only reason we're fetching these URLs is in an effort to pre-seed the cache of intermediate certificates, so the specific URL that we're requesting is uninteresting: we just need to fetch *something*. dbus#546 Signed-off-by: Simon McVittie --- .gitlab-ci.yml | 2 +- tools/docker/windows/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a267ed2c1..3862bd80c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,7 +55,7 @@ variables: # If you are hacking on them or need a them to rebuild, its enough # to change any part of the string of the image you want. ### - WINDOWS_TAG: "2023-05-12.0" + WINDOWS_TAG: "2025-02-27.0" UPSTREAM_BRANCH: 'main' UPSTREAM_REPO: 'dbus/dbus' diff --git a/tools/docker/windows/Dockerfile b/tools/docker/windows/Dockerfile index 53be741be..1876a2268 100644 --- a/tools/docker/windows/Dockerfile +++ b/tools/docker/windows/Dockerfile @@ -24,7 +24,7 @@ RUN pip3 install meson # See also: https://bugs.python.org/issue36011 RUN pip3 install --upgrade certifi RUN pip3 install python-certifi-win32 -RUN (New-Object System.Net.WebClient).DownloadString('https://sourceforge.net/projects/pcre/files/pcre/8.37/pcre-8.37.tar.gz.sig') >$null +RUN (New-Object System.Net.WebClient).DownloadString('https://sourceforge.net/robots.txt') >$null RUN (New-Object System.Net.WebClient).DownloadString('https://wrapdb.mesonbuild.com/v2/pcre_8.37-2/get_patch') >$null RUN (New-Object System.Net.WebClient).DownloadString('https://zlib.net/fossils/') >$null -- 2.47.3