From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Mon, 6 Feb 2023 14:36:15 +0000 (+0100)
Subject: Add official Ubuntu mirror list as fallback for Actions caching proxy
X-Git-Tag: 2.1.0-beta1~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a21d2bcbc0699d8c6c3cb322433cde80c8daee00;p=thirdparty%2Fzlib-ng.git

Add official Ubuntu mirror list as fallback for Actions caching proxy
---

diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
index 3a38edd9..17333d24 100644
--- a/.github/workflows/analyze.yml
+++ b/.github/workflows/analyze.yml
@@ -8,6 +8,13 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - name: Add ubuntu mirrors
+      run: |
+        # Github Actions caching proxy is at times unreliable
+        echo -e 'http://azure.archive.ubuntu.com/ubuntu\tpriority:1\n' | sudo tee /etc/apt/mirrors.txt
+        curl http://mirrors.ubuntu.com/mirrors.txt | sudo tee --append /etc/apt/mirrors.txt
+        sudo sed -i 's#http://azure.archive.ubuntu.com/ubuntu/#mirror+file:/etc/apt/mirrors.txt#' /etc/apt/sources.list
+
     - name: Install packages (Ubuntu)
       run: sudo apt-get install -y gcc-10
 
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 1d0eeeb2..102cef08 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -460,6 +460,14 @@ jobs:
       if: contains(matrix.packages, 'wine')
       run: sudo dpkg --add-architecture i386
 
+    - name: Add ubuntu mirrors
+      if: runner.os == 'Linux' && matrix.packages
+      run: |
+        # Github Actions caching proxy is at times unreliable
+        echo -e 'http://azure.archive.ubuntu.com/ubuntu\tpriority:1\n' | sudo tee /etc/apt/mirrors.txt
+        curl http://mirrors.ubuntu.com/mirrors.txt | sudo tee --append /etc/apt/mirrors.txt
+        sudo sed -i 's#http://azure.archive.ubuntu.com/ubuntu/#mirror+file:/etc/apt/mirrors.txt#' /etc/apt/sources.list
+
     - name: Install packages (Ubuntu)
       if: runner.os == 'Linux' && matrix.packages
       run: |
diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
index e0dde6f9..51861533 100644
--- a/.github/workflows/configure.yml
+++ b/.github/workflows/configure.yml
@@ -188,6 +188,14 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - name: Add ubuntu mirrors
+      if: runner.os == 'Linux' && matrix.packages
+      run: |
+        # Github Actions caching proxy is at times unreliable
+        echo -e 'http://azure.archive.ubuntu.com/ubuntu\tpriority:1\n' | sudo tee /etc/apt/mirrors.txt
+        curl http://mirrors.ubuntu.com/mirrors.txt | sudo tee --append /etc/apt/mirrors.txt
+        sudo sed -i 's#http://azure.archive.ubuntu.com/ubuntu/#mirror+file:/etc/apt/mirrors.txt#' /etc/apt/sources.list
+
     - name: Install packages (Ubuntu)
       if: runner.os == 'Linux' && matrix.packages
       run: |
diff --git a/.github/workflows/pigz.yml b/.github/workflows/pigz.yml
index 6a505a11..e90cb63a 100644
--- a/.github/workflows/pigz.yml
+++ b/.github/workflows/pigz.yml
@@ -59,6 +59,14 @@ jobs:
         repository: zlib-ng/corpora
         path: test/data/corpora
 
+    - name: Add ubuntu mirrors
+      if: runner.os == 'Linux' && matrix.packages
+      run: |
+        # Github Actions caching proxy is at times unreliable
+        echo -e 'http://azure.archive.ubuntu.com/ubuntu\tpriority:1\n' | sudo tee /etc/apt/mirrors.txt
+        curl http://mirrors.ubuntu.com/mirrors.txt | sudo tee --append /etc/apt/mirrors.txt
+        sudo sed -i 's#http://azure.archive.ubuntu.com/ubuntu/#mirror+file:/etc/apt/mirrors.txt#' /etc/apt/sources.list
+
     - name: Install packages (Ubuntu)
       if: runner.os == 'Linux' && matrix.packages
       run: |
diff --git a/.github/workflows/pkgcheck.yml b/.github/workflows/pkgcheck.yml
index 0bb97fd8..8888cf37 100644
--- a/.github/workflows/pkgcheck.yml
+++ b/.github/workflows/pkgcheck.yml
@@ -78,6 +78,14 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - name: Add ubuntu mirrors
+      if: runner.os == 'Linux' && matrix.packages
+      run: |
+        # Github Actions caching proxy is at times unreliable
+        echo -e 'http://azure.archive.ubuntu.com/ubuntu\tpriority:1\n' | sudo tee /etc/apt/mirrors.txt
+        curl http://mirrors.ubuntu.com/mirrors.txt | sudo tee --append /etc/apt/mirrors.txt
+        sudo sed -i 's#http://azure.archive.ubuntu.com/ubuntu/#mirror+file:/etc/apt/mirrors.txt#' /etc/apt/sources.list
+
     - name: Install packages (Ubuntu)
       if: runner.os == 'Linux'
       run: |