|
24 | 24 | uses: actions/cache@v2 |
25 | 25 | with: |
26 | 26 | path: | |
27 | | - ~/PawPawBuilds/builds |
28 | | - ~/PawPawBuilds/downloads |
29 | | - ~/PawPawBuilds/targets |
| 27 | + ~/PawPawBuilds |
30 | 28 | key: cache-macos |
31 | 29 | - name: Set up dependencies |
32 | 30 | run: | |
|
58 | 56 | uses: actions/cache@v2 |
59 | 57 | with: |
60 | 58 | path: | |
61 | | - ~/PawPawBuilds/builds |
62 | | - ~/PawPawBuilds/downloads |
63 | | - ~/PawPawBuilds/targets |
| 59 | + ~/PawPawBuilds |
64 | 60 | key: cache-macos-universal |
65 | 61 | - name: Set up dependencies |
66 | 62 | run: | |
@@ -96,26 +92,27 @@ jobs: |
96 | 92 | uses: actions/cache@v2 |
97 | 93 | with: |
98 | 94 | path: | |
99 | | - ~/PawPawBuilds/builds |
100 | | - ~/PawPawBuilds/debs |
101 | | - ~/PawPawBuilds/downloads |
102 | | - ~/PawPawBuilds/targets |
| 95 | + ~/PawPawBuilds |
103 | 96 | key: cache-win32 |
104 | 97 | - name: Restore debian packages cache |
105 | 98 | run: | |
106 | 99 | if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \ |
107 | 100 | sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \ |
108 | 101 | 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 |
109 | 107 | - name: Set up dependencies |
110 | 108 | 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 |
116 | 113 | - name: Cache debian packages |
117 | 114 | run: | |
118 | | - mkdir -p ~/PawPawBuilds/debs && \ |
| 115 | + mkdir -p ~/PawPawBuilds/debs |
119 | 116 | sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/ |
120 | 117 | - name: Bootstrap win32 cross-compiled |
121 | 118 | shell: bash |
@@ -144,26 +141,27 @@ jobs: |
144 | 141 | uses: actions/cache@v2 |
145 | 142 | with: |
146 | 143 | path: | |
147 | | - ~/PawPawBuilds/builds |
148 | | - ~/PawPawBuilds/debs |
149 | | - ~/PawPawBuilds/downloads |
150 | | - ~/PawPawBuilds/targets |
| 144 | + ~/PawPawBuilds |
151 | 145 | key: cache-win64 |
152 | 146 | - name: Restore debian packages cache |
153 | 147 | run: | |
154 | 148 | if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \ |
155 | 149 | sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \ |
156 | 150 | 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 |
157 | 156 | - name: Set up dependencies |
158 | 157 | 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 |
164 | 162 | - name: Cache debian packages |
165 | 163 | run: | |
166 | | - mkdir -p ~/PawPawBuilds/debs && \ |
| 164 | + mkdir -p ~/PawPawBuilds/debs |
167 | 165 | sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/ |
168 | 166 | - name: Bootstrap win64 cross-compiled |
169 | 167 | shell: bash |
|
0 commit comments