From aeedd60b7a08283aa1743a01cd99a6c732259e68 Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 17 Jan 2022 12:09:18 +0000 Subject: [PATCH] Fix up CI Signed-off-by: falkTX --- .github/workflows/build.yml | 17 ++++++++++++++++- .github/workflows/wine.yml | 5 +++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea3d0e56f..62b044464 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,6 +81,11 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 + - name: Fix GitHub's mess + run: | + sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list + sudo apt-get update -qq + sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal - name: Set up dependencies run: | sudo dpkg --add-architecture i386 @@ -99,7 +104,7 @@ jobs: run: make posix32 -j $(nproc) ubuntu-mingw-win32: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 env: CC: i686-w64-mingw32-gcc CXX: i686-w64-mingw32-g++ @@ -108,6 +113,11 @@ jobs: WINEDEBUG: "-all" steps: - uses: actions/checkout@v2 + - name: Fix GitHub's mess + run: | + sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list + sudo apt-get update -qq + sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal - name: Set up dependencies run: | sudo dpkg --add-architecture i386 @@ -128,6 +138,11 @@ jobs: WINEDEBUG: "-all" steps: - uses: actions/checkout@v2 + - name: Fix GitHub's mess + run: | + sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list + sudo apt-get update -qq + sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal - name: Set up dependencies run: | sudo apt-get update -qq diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml index 351d1bb29..68e1cf4c2 100644 --- a/.github/workflows/wine.yml +++ b/.github/workflows/wine.yml @@ -47,6 +47,11 @@ jobs: WINEDEBUG: "-all" steps: - uses: actions/checkout@v2 + - name: Fix GitHub's mess + run: | + sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list + sudo apt-get update -qq + sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal - name: Set up dependencies run: | sudo dpkg --add-architecture i386