Skip to content

Commit 1c2ad34

Browse files
committed
Update PawPaw and do initial bootstrap push
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 02f8f11 commit 1c2ad34

File tree

2 files changed

+43
-42
lines changed

2 files changed

+43
-42
lines changed

.github/workflows/release.yml

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ on:
88
branches:
99
- '*'
1010
env:
11-
BOOTSTRAP_VERSION: 1
11+
CACHE_VERSION: 1
1212
DEBIAN_FRONTEND: noninteractive
1313
HOMEBREW_NO_AUTO_UPDATE: 1
14+
PAWPAW_SKIP_LTO: 1
1415

1516
jobs:
1617
# macOS native intel build
@@ -25,7 +26,7 @@ jobs:
2526
with:
2627
path: |
2728
~/PawPawBuilds
28-
key: cache-macos
29+
key: macos-v${{ env.CACHE_VERSION }}
2930
- name: Set up dependencies
3031
run: |
3132
brew install cmake jq meson
@@ -47,7 +48,7 @@ jobs:
4748

4849
# macOS native universal build
4950
macos_universal:
50-
runs-on: macos-latest
51+
runs-on: macos-10.15
5152
steps:
5253
- uses: actions/checkout@v2
5354
with:
@@ -57,7 +58,7 @@ jobs:
5758
with:
5859
path: |
5960
~/PawPawBuilds
60-
key: cache-macos-universal
61+
key: macos-universal-v${{ env.CACHE_VERSION }}
6162
- name: Set up dependencies
6263
run: |
6364
brew install cmake jq meson
@@ -69,17 +70,17 @@ jobs:
6970
shell: bash
7071
run: |
7172
./PawPaw/bootstrap-jack2.sh macos-universal && ./PawPaw/bootstrap-qt.sh macos-universal && ./PawPaw/.cleanup.sh macos-universal
72-
- name: Build macOS universal
73-
shell: bash
74-
run: |
75-
./pack-jack2-version.sh macos-universal
76-
- name: Set sha8
77-
id: slug
78-
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
79-
- uses: actions/upload-artifact@v2
80-
with:
81-
name: jack2-macOS-universal-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
82-
path: PawPaw/jack2-macOS-*.tar.gz
73+
#- name: Build macOS universal
74+
#shell: bash
75+
#run: |
76+
#./pack-jack2-version.sh macos-universal
77+
#- name: Set sha8
78+
#id: slug
79+
#run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
80+
#- uses: actions/upload-artifact@v2
81+
#with:
82+
#name: jack2-macOS-universal-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
83+
#path: PawPaw/jack2-macOS-*.tar.gz
8384

8485
# linux with win32 cross-compilation
8586
win32:
@@ -93,7 +94,7 @@ jobs:
9394
with:
9495
path: |
9596
~/PawPawBuilds
96-
key: cache-win32
97+
key: win32-v${{ env.CACHE_VERSION }}
9798
- name: Restore debian packages cache
9899
run: |
99100
if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
@@ -103,7 +104,7 @@ jobs:
103104
run: |
104105
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
105106
sudo apt-get update -qq
106-
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal
107+
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
107108
- name: Set up dependencies
108109
run: |
109110
sudo dpkg --add-architecture i386
@@ -118,17 +119,17 @@ jobs:
118119
shell: bash
119120
run: |
120121
./PawPaw/bootstrap-jack2.sh win32 && ./PawPaw/bootstrap-qt.sh win32 && ./PawPaw/.cleanup.sh win32
121-
- name: Build win32 cross-compiled
122-
shell: bash
123-
run: |
124-
xvfb-run ./pack-jack2-version.sh win32
125-
- name: Set sha8
126-
id: slug
127-
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
128-
- uses: actions/upload-artifact@v2
129-
with:
130-
name: jack2-win32-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
131-
path: PawPaw/jack2-win*.exe
122+
#- name: Build win32 cross-compiled
123+
#shell: bash
124+
#run: |
125+
#xvfb-run ./pack-jack2-version.sh win32
126+
#- name: Set sha8
127+
#id: slug
128+
#run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
129+
#- uses: actions/upload-artifact@v2
130+
#with:
131+
#name: jack2-win32-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
132+
#path: PawPaw/jack2-win*.exe
132133

133134
# linux with win64 cross-compilation
134135
win64:
@@ -142,7 +143,7 @@ jobs:
142143
with:
143144
path: |
144145
~/PawPawBuilds
145-
key: cache-win64
146+
key: win64-v${{ env.CACHE_VERSION }}
146147
- name: Restore debian packages cache
147148
run: |
148149
if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
@@ -152,7 +153,7 @@ jobs:
152153
run: |
153154
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
154155
sudo apt-get update -qq
155-
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal
156+
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
156157
- name: Set up dependencies
157158
run: |
158159
sudo dpkg --add-architecture i386
@@ -167,14 +168,14 @@ jobs:
167168
shell: bash
168169
run: |
169170
./PawPaw/bootstrap-jack2.sh win64 && ./PawPaw/bootstrap-qt.sh win64 && ./PawPaw/.cleanup.sh win64
170-
- name: Build win64 cross-compiled
171-
shell: bash
172-
run: |
173-
xvfb-run ./pack-jack2-version.sh win64
174-
- name: Set sha8
175-
id: slug
176-
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
177-
- uses: actions/upload-artifact@v2
178-
with:
179-
name: jack2-win64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
180-
path: PawPaw/jack2-win*.exe
171+
#- name: Build win64 cross-compiled
172+
#shell: bash
173+
#run: |
174+
#xvfb-run ./pack-jack2-version.sh win64
175+
#- name: Set sha8
176+
#id: slug
177+
#run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
178+
#- uses: actions/upload-artifact@v2
179+
#with:
180+
#name: jack2-win64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
181+
#path: PawPaw/jack2-win*.exe

0 commit comments

Comments
 (0)