Skip to content

Commit 02f8f11

Browse files
committed
Cleanup CI
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 9f936d3 commit 02f8f11

1 file changed

Lines changed: 24 additions & 26 deletions

File tree

.github/workflows/release.yml

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ jobs:
2424
uses: actions/cache@v2
2525
with:
2626
path: |
27-
~/PawPawBuilds/builds
28-
~/PawPawBuilds/downloads
29-
~/PawPawBuilds/targets
27+
~/PawPawBuilds
3028
key: cache-macos
3129
- name: Set up dependencies
3230
run: |
@@ -58,9 +56,7 @@ jobs:
5856
uses: actions/cache@v2
5957
with:
6058
path: |
61-
~/PawPawBuilds/builds
62-
~/PawPawBuilds/downloads
63-
~/PawPawBuilds/targets
59+
~/PawPawBuilds
6460
key: cache-macos-universal
6561
- name: Set up dependencies
6662
run: |
@@ -96,26 +92,27 @@ jobs:
9692
uses: actions/cache@v2
9793
with:
9894
path: |
99-
~/PawPawBuilds/builds
100-
~/PawPawBuilds/debs
101-
~/PawPawBuilds/downloads
102-
~/PawPawBuilds/targets
95+
~/PawPawBuilds
10396
key: cache-win32
10497
- name: Restore debian packages cache
10598
run: |
10699
if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
107100
sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \
108101
fi
102+
- name: Fix GitHub's mess
103+
run: |
104+
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
105+
sudo apt-get update -qq
106+
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal
109107
- name: Set up dependencies
110108
run: |
111-
wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add - && \
112-
sudo dpkg --add-architecture i386 && \
113-
sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main' && \
114-
sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools qttools5-dev winehq-stable xvfb \
115-
binutils-mingw-w64-i686 g++-mingw-w64-i686
109+
sudo dpkg --add-architecture i386
110+
sudo apt-get update -qq
111+
sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools xvfb \
112+
binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386
116113
- name: Cache debian packages
117114
run: |
118-
mkdir -p ~/PawPawBuilds/debs && \
115+
mkdir -p ~/PawPawBuilds/debs
119116
sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/
120117
- name: Bootstrap win32 cross-compiled
121118
shell: bash
@@ -144,26 +141,27 @@ jobs:
144141
uses: actions/cache@v2
145142
with:
146143
path: |
147-
~/PawPawBuilds/builds
148-
~/PawPawBuilds/debs
149-
~/PawPawBuilds/downloads
150-
~/PawPawBuilds/targets
144+
~/PawPawBuilds
151145
key: cache-win64
152146
- name: Restore debian packages cache
153147
run: |
154148
if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
155149
sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \
156150
fi
151+
- name: Fix GitHub's mess
152+
run: |
153+
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
154+
sudo apt-get update -qq
155+
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal
157156
- name: Set up dependencies
158157
run: |
159-
wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add - && \
160-
sudo dpkg --add-architecture i386 && \
161-
sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main' && \
162-
sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools qttools5-dev winehq-stable xvfb \
163-
binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64
158+
sudo dpkg --add-architecture i386
159+
sudo apt-get update -qq
160+
sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools xvfb \
161+
binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable
164162
- name: Cache debian packages
165163
run: |
166-
mkdir -p ~/PawPawBuilds/debs && \
164+
mkdir -p ~/PawPawBuilds/debs
167165
sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/
168166
- name: Bootstrap win64 cross-compiled
169167
shell: bash

0 commit comments

Comments
 (0)