summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfalkTX <falktx@falktx.com>2022-01-04 19:38:01 +0000
committerfalkTX <falktx@falktx.com>2022-01-04 19:38:01 +0000
commit88fcf0571e9e203afcd7815566eb859dc366c2c0 (patch)
tree5fc0b63ec2bac3852c47c150390e9710fdb7b57a
parenta50aeb1f331546e86c1f35f26e67692c1cdfc9a5 (diff)
downloadjack2-88fcf0571e9e203afcd7815566eb859dc366c2c0.tar.gz
Fix CI
Signed-off-by: falkTX <falktx@falktx.com>
-rw-r--r--.github/workflows/build.yml18
1 files changed, 9 insertions, 9 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 69967252..3f5ac07f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -109,7 +109,7 @@ jobs:
# linux with win32 cross-compilation
win32:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
with:
@@ -130,11 +130,11 @@ jobs:
fi
- name: Set up dependencies
run: |
- wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
sudo dpkg --add-architecture i386
- sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main'
- sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools winehq-stable xvfb \
- binutils-mingw-w64-i686 g++-mingw-w64-i686
+ sudo apt-get update -qq
+ sudo apt-get install -yq autopoint build-essential curl cmake jq llvm qttools5-dev-tools xvfb
+ sudo apt-get install -yq g++-multilib libfreetype6-dev libgl1-mesa-dev libx11-dev libxcursor-dev libxext-dev pkg-config wine-stable wine64-tools
+ sudo apt-get install -yq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64
- name: Cache debian packages
run: |
mkdir -p ~/PawPawBuilds/debs && \
@@ -208,11 +208,11 @@ jobs:
fi
- name: Set up dependencies
run: |
- wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
sudo dpkg --add-architecture i386
- sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main'
- sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools winehq-stable xvfb \
- binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64
+ sudo apt-get update -qq
+ sudo apt-get install -yq autopoint build-essential curl cmake jq llvm qttools5-dev-tools xvfb
+ sudo apt-get install -yq g++-multilib libfreetype6-dev libgl1-mesa-dev libx11-dev libxcursor-dev libxext-dev pkg-config wine-stable wine64-tools
+ sudo apt-get install -yq binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 mingw-w64
- name: Cache debian packages
run: |
mkdir -p ~/PawPawBuilds/debs && \