summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-02-11 22:06:01 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-02-11 22:06:01 +0100
commita4c2d8dc7a7f74bd3769dc0616d726f7a02968e2 (patch)
treeb849aebbb6b8f59a21c2691ee296d3d971662292
parentcb2e73d57807b00c9549775e30372816c8dd2ca4 (diff)
parent57d0afb365c305902373dd3f4d85a5a1592bf478 (diff)
Merge pull request #73059 from akien-mga/corn-flakes
CI: Remove flaky packages.microsoft.com Ubuntu repository
-rw-r--r--.github/workflows/linux_builds.yml2
-rw-r--r--.github/workflows/static_checks.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 46a9228616..0000a061d7 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -78,8 +78,8 @@ jobs:
- name: Linux dependencies for tests
if: ${{ matrix.proj-test }}
run: |
+ sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo add-apt-repository ppa:kisak/kisak-mesa
- sudo apt-get update
sudo apt-get install -qq mesa-vulkan-drivers
- name: Setup Godot build cache
diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml
index a3722e19ce..6c92922185 100644
--- a/.github/workflows/static_checks.yml
+++ b/.github/workflows/static_checks.yml
@@ -15,9 +15,9 @@ jobs:
- name: Install dependencies
run: |
+ sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main"
- sudo apt-get update
sudo apt-get install -qq dos2unix clang-format-15 libxml2-utils python3-pip moreutils
sudo update-alternatives --remove-all clang-format || true
sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-15 100