summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Flynn <trflynn89@pm.me>2023-02-09 09:24:40 -0500
committerLinus Groh <mail@linusgroh.de>2023-02-09 14:57:27 +0000
commit49474d8718e0a95f43631501ae17e21612d1aed1 (patch)
treec9d4b486177b9e8f760faf292dafa1cc12e7d881
parente127c4acdc081b83f21513873984e19cf4c9f6a1 (diff)
downloadserenity-49474d8718e0a95f43631501ae17e21612d1aed1.zip
Revert "Meta: Automatically select best apt mirror"
This reverts commit b0606d90f0da2fd2651768d1e250a692e3c92abf. This seems to prevent libegl-mesa0 from being installed (which for some reason isn't failing the Azure jobs - the failure seen later is that ccache is not installed).
-rw-r--r--.github/workflows/cmake.yml6
-rw-r--r--.github/workflows/libjs-test262.yml5
-rw-r--r--.github/workflows/pvs-studio-static-analysis.yml5
-rw-r--r--.github/workflows/serenity-js-artifacts.yml6
-rw-r--r--.github/workflows/sonar-cloud-static-analysis.yml5
-rw-r--r--.github/workflows/wasm.yml4
-rw-r--r--Meta/Azure/Setup.yml6
7 files changed, 0 insertions, 37 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 69cb59db1c..7762519296 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -45,12 +45,6 @@ jobs:
# === OS SETUP ===
- # An attempt to avoid the (fairly common) azure apt mirror downtime.
- - name: "Select best APT mirror"
- run: |
- sudo gem install apt-spy2
- sudo apt-spy2 fix --commit --launchpad --country=US
-
# Do we need to update the package cache first?
# sudo apt-get update -qq
- name: "Install Ubuntu dependencies"
diff --git a/.github/workflows/libjs-test262.yml b/.github/workflows/libjs-test262.yml
index f37fce314a..e64b48badb 100644
--- a/.github/workflows/libjs-test262.yml
+++ b/.github/workflows/libjs-test262.yml
@@ -45,11 +45,6 @@ jobs:
repository: tc39/test262-parser-tests
path: test262-parser-tests
- - name: "Select best APT mirror"
- run: |
- sudo gem install apt-spy2
- sudo apt-spy2 fix --commit --launchpad --country=US
-
- name: Install dependencies
run: |
sudo apt-get update
diff --git a/.github/workflows/pvs-studio-static-analysis.yml b/.github/workflows/pvs-studio-static-analysis.yml
index 3554c9774f..ed3a175255 100644
--- a/.github/workflows/pvs-studio-static-analysis.yml
+++ b/.github/workflows/pvs-studio-static-analysis.yml
@@ -19,11 +19,6 @@ jobs:
wget -q -O - https://files.pvs-studio.com/beta/etc/pubkey.txt | sudo apt-key add -
sudo wget -O /etc/apt/sources.list.d/viva64.list https://files.pvs-studio.com/beta/etc/viva64.list
- - name: "Select best APT mirror"
- run: |
- sudo gem install apt-spy2
- sudo apt-spy2 fix --commit --launchpad --country=US
-
- name: "Install Ubuntu dependencies"
# These packages are already part of the ubuntu-22.04 image:
# cmake libgmp-dev npm shellcheck
diff --git a/.github/workflows/serenity-js-artifacts.yml b/.github/workflows/serenity-js-artifacts.yml
index 61b00f9bf3..5585f01c3c 100644
--- a/.github/workflows/serenity-js-artifacts.yml
+++ b/.github/workflows/serenity-js-artifacts.yml
@@ -26,12 +26,6 @@ jobs:
- name: Checkout SerenityOS/serenity
uses: actions/checkout@v3
- - name: "Select best APT mirror"
- run: |
- sudo gem install apt-spy2
- sudo apt-spy2 fix --commit --launchpad --country=US
- if: ${{ matrix.os == 'ubuntu-22.04' }}
-
- name: Install dependencies Ubuntu
run: |
sudo apt-get update
diff --git a/.github/workflows/sonar-cloud-static-analysis.yml b/.github/workflows/sonar-cloud-static-analysis.yml
index 0b1dac37f0..086c5fc67a 100644
--- a/.github/workflows/sonar-cloud-static-analysis.yml
+++ b/.github/workflows/sonar-cloud-static-analysis.yml
@@ -53,11 +53,6 @@ jobs:
# === OS SETUP ===
# TODO: Is there someway to share these steps with the cmake.yml?
- - name: "Select best APT mirror"
- run: |
- sudo gem install apt-spy2
- sudo apt-spy2 fix --commit --launchpad --country=US
-
- name: "Install Ubuntu dependencies"
# These packages are already part of the ubuntu-22.04 image:
# cmake libgmp-dev npm shellcheck
diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
index dcf3491d96..2723a0bf0f 100644
--- a/.github/workflows/wasm.yml
+++ b/.github/workflows/wasm.yml
@@ -17,10 +17,6 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: '3.x'
- - name: "Select best APT mirror"
- run: |
- sudo gem install apt-spy2
- sudo apt-spy2 fix --commit --launchpad --country=US
- name: "Install Ubuntu dependencies"
run: |
sudo apt-get update
diff --git a/Meta/Azure/Setup.yml b/Meta/Azure/Setup.yml
index 0cd87c132c..66a274147c 100644
--- a/Meta/Azure/Setup.yml
+++ b/Meta/Azure/Setup.yml
@@ -5,12 +5,6 @@ steps:
- checkout: self
persistCredentials: true
- - ${{ if in(parameters.os, 'Linux', 'Serenity', 'Android') }}:
- - script: |
- sudo gem install apt-spy2
- sudo apt-spy2 fix --commit --launchpad --country=US
- displayName: 'Select best APT mirror'
-
- ${{ if eq(parameters.os, 'Serenity') }}:
- script: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -