diff options
| author | Filipe Coelho <falktx@falktx.com> | 2022-01-08 04:17:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-08 04:17:48 +0000 |
| commit | 48d8d64f0990be59f20809506b22fc9670ef0881 (patch) | |
| tree | 6b1f433994220316c57a5d3f2fabd37b565f043b | |
| parent | d9bbf5f8453b8224631ace9d5bb9f0b1585598a0 (diff) | |
| download | jack2-48d8d64f0990be59f20809506b22fc9670ef0881.tar.gz | |
Fix CI windows builds (#830)
* Alternative attempt at fixing CI
Signed-off-by: falkTX <falktx@falktx.com>
* Cleanup
Signed-off-by: falkTX <falktx@falktx.com>
* Forgot apt-get update
Signed-off-by: falkTX <falktx@falktx.com>
| -rw-r--r-- | .github/workflows/build.yml | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69967252..a33f255c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,9 +24,7 @@ jobs: uses: actions/cache@v2 with: path: | - ~/PawPawBuilds/builds - ~/PawPawBuilds/downloads - ~/PawPawBuilds/targets + ~/PawPawBuilds key: macos - name: Set up dependencies run: | @@ -69,9 +67,7 @@ jobs: uses: actions/cache@v2 with: path: | - ~/PawPawBuilds/builds - ~/PawPawBuilds/downloads - ~/PawPawBuilds/targets + ~/PawPawBuilds key: macos-universal - name: Set up dependencies run: | @@ -118,23 +114,24 @@ jobs: uses: actions/cache@v2 with: path: | - ~/PawPawBuilds/builds - ~/PawPawBuilds/debs - ~/PawPawBuilds/downloads - ~/PawPawBuilds/targets + ~/PawPawBuilds key: win32 - name: Restore debian packages cache run: | if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \ sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \ fi + - name: Fix GitHub 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 - 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 -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools xvfb \ + binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386 - name: Cache debian packages run: | mkdir -p ~/PawPawBuilds/debs && \ @@ -196,23 +193,24 @@ jobs: uses: actions/cache@v2 with: path: | - ~/PawPawBuilds/builds - ~/PawPawBuilds/debs - ~/PawPawBuilds/downloads - ~/PawPawBuilds/targets + ~/PawPawBuilds key: win64 - name: Restore debian packages cache run: | if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \ sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \ fi + - name: Fix GitHub 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 - 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 -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools xvfb \ + binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable - name: Cache debian packages run: | mkdir -p ~/PawPawBuilds/debs && \ |