766969be39 — curl

Subject

GHA: sync apt-get code between workflows/jobs

No binary (build failed)

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

(log yok)

.github/workflows/configure-vs-cmake.yml+2 -0

@@ -149,7 +149,9 @@ jobs:
	- name: 'install packages'
	timeout-minutes: 1
	run: \|
+	sudo find /etc/apt/sources.list.d -type f -not -name 'ubuntu.sources' -delete -print
	sudo sed -i 's/priority:1/priority:9/' /etc/apt/apt-mirrors.txt; cat /etc/apt/apt-mirrors.txt
+	sudo apt-get -o Dpkg::Use-Pty=0 update
	sudo apt-get -o Dpkg::Use-Pty=0 install gcc-mingw-w64-x86-64-win32

	- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/distcheck.yml+2 -0

@@ -289,7 +289,9 @@ jobs:
	sha256sum pkg.bin && sha256sum pkg.bin \| grep -qwF -- "${OLD_CMAKE_SHA256_WIN_INTEL}" && unzip -q pkg.bin && rm -f pkg.bin
	printf '%s' ~/cmake-"${OLD_CMAKE_VERSION}"-win64-x64/bin/cmake.exe > ~/old-cmake-path.txt
	elif [[ "${MATRIX_IMAGE}" = 'ubuntu' ]]; then
+	sudo find /etc/apt/sources.list.d -type f -not -name 'ubuntu.sources' -delete -print
	sudo sed -i 's/priority:1/priority:9/' /etc/apt/apt-mirrors.txt; cat /etc/apt/apt-mirrors.txt
+	sudo apt-get -o Dpkg::Use-Pty=0 update
	sudo apt-get -o Dpkg::Use-Pty=0 install libpsl-dev libssl-dev
	cd ~
	curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 60 --retry 3 --retry-connrefused \

.github/workflows/linux.yml+1 -0

@@ -834,6 +834,7 @@ jobs:
	curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 120 --retry 6 --retry-connrefused \
	--compressed https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \| \
	sudo tee /etc/apt/trusted.gpg.d/intel-sw.asc >/dev/null
+	sudo find /etc/apt/sources.list.d -type f -not -name 'ubuntu.sources' -delete -print
	sudo sed -i 's/priority:1/priority:9/' /etc/apt/apt-mirrors.txt; cat /etc/apt/apt-mirrors.txt
	sudo add-apt-repository 'deb https://apt.repos.intel.com/oneapi all main'
	sudo apt-get -o Dpkg::Use-Pty=0 install intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic

.github/workflows/non-native.yml+2 -0

@@ -418,7 +418,9 @@ jobs:
	- name: 'install packages'
	timeout-minutes: 2
	run: \|
+	sudo find /etc/apt/sources.list.d -type f -not -name 'ubuntu.sources' -delete -print
	sudo sed -i 's/priority:1/priority:9/' /etc/apt/apt-mirrors.txt; cat /etc/apt/apt-mirrors.txt
+	sudo apt-get -o Dpkg::Use-Pty=0 update
	sudo apt-get -o Dpkg::Use-Pty=0 install libfl2

	- name: 'cache compiler (djgpp)'

.github/workflows/windows.yml+2 -0

@@ -788,6 +788,8 @@ jobs:
	env:
	MATRIX_INSTALL_PACKAGES: '${{ matrix.install_packages }}'
	run: \|
+	ls -l /etc/apt/sources.list.d
+	sudo find /etc/apt/sources.list.d -type f -not -name 'ubuntu.sources' -delete -print
	sudo sed -i 's/priority:1/priority:9/' /etc/apt/apt-mirrors.txt; cat /etc/apt/apt-mirrors.txt
	sudo apt-get -o Dpkg::Use-Pty=0 update
	sudo apt-get -o Dpkg::Use-Pty=0 install gcc-mingw-w64-x86-64-win32 ${MATRIX_INSTALL_PACKAGES}