Browse Source

Fix up CI

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.4.2
falkTX 2 years ago
parent
commit
aeedd60b7a
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 21 additions and 1 deletions
  1. +16
    -1
      .github/workflows/build.yml
  2. +5
    -0
      .github/workflows/wine.yml

+ 16
- 1
.github/workflows/build.yml View File

@@ -81,6 +81,11 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - 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 - name: Set up dependencies
run: | run: |
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
@@ -99,7 +104,7 @@ jobs:
run: make posix32 -j $(nproc) run: make posix32 -j $(nproc)


ubuntu-mingw-win32: ubuntu-mingw-win32:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
env: env:
CC: i686-w64-mingw32-gcc CC: i686-w64-mingw32-gcc
CXX: i686-w64-mingw32-g++ CXX: i686-w64-mingw32-g++
@@ -108,6 +113,11 @@ jobs:
WINEDEBUG: "-all" WINEDEBUG: "-all"
steps: steps:
- uses: actions/checkout@v2 - 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 - name: Set up dependencies
run: | run: |
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
@@ -128,6 +138,11 @@ jobs:
WINEDEBUG: "-all" WINEDEBUG: "-all"
steps: steps:
- uses: actions/checkout@v2 - 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 - name: Set up dependencies
run: | run: |
sudo apt-get update -qq sudo apt-get update -qq


+ 5
- 0
.github/workflows/wine.yml View File

@@ -47,6 +47,11 @@ jobs:
WINEDEBUG: "-all" WINEDEBUG: "-all"
steps: steps:
- uses: actions/checkout@v2 - 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 - name: Set up dependencies
run: | run: |
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386


Loading…
Cancel
Save