Skip to content

Commit 43e1173

Browse files
committed
Update CI setup
Signed-off-by: falkTX <[email protected]>
1 parent e21da65 commit 43e1173

File tree

2 files changed

+32
-30
lines changed

2 files changed

+32
-30
lines changed

.github/workflows/build.yml

+29-26
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
branches:
99
- '*'
1010
env:
11-
CACHE_VERSION: 20230704
12-
PAWPAW_VERSION: 6a3c6a65a89abe221858c3f7635140074506bfc3
11+
CACHE_VERSION: 20240930
12+
PAWPAW_VERSION: a9ab736dc297b2055536c71cddf1c79711d420bb
1313
PAWPAW_SKIP_LTO: 1
1414
PAWPAW_SKIP_GLIB: 1
1515
PAWPAW_SKIP_LV2: 1
@@ -19,13 +19,13 @@ jobs:
1919
strategy:
2020
matrix:
2121
target: [intel, universal]
22-
runs-on: macos-11
22+
runs-on: macos-12
2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
with:
2626
submodules: recursive
2727
- name: Set up cache
28-
uses: actions/cache@v3
28+
uses: actions/cache@v4
2929
with:
3030
path: |
3131
~/PawPawBuilds
@@ -40,7 +40,9 @@ jobs:
4040
git clone https://github.com/DISTRHO/PawPaw.git
4141
git -C PawPaw checkout ${PAWPAW_VERSION}
4242
fi
43-
./PawPaw/bootstrap-jack2.sh macos-${{ matrix.target }} && ./PawPaw/.cleanup.sh macos-${{ matrix.target }}
43+
./PawPaw/.github/workflows/bootstrap-deps.sh macos-${{ matrix.target }}
44+
./PawPaw/bootstrap-jack2.sh macos-${{ matrix.target }}
45+
./PawPaw/.cleanup.sh macos-${{ matrix.target }}
4446
- name: Build jack2
4547
shell: bash
4648
run: |
@@ -58,7 +60,7 @@ jobs:
5860
shell: bash
5961
run: |
6062
./macosx/generate-pkg.sh $(pwd)/destdir/usr/local ${{ github.event.pull_request.number || env.SHA8 }}
61-
- uses: actions/upload-artifact@v3
63+
- uses: actions/upload-artifact@v4
6264
with:
6365
name: jack2-macOS-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}
6466
path: macosx/jack2-osx-*.pkg
@@ -69,48 +71,47 @@ jobs:
6971
target: [win32, win64]
7072
runs-on: ubuntu-22.04
7173
steps:
72-
- uses: actions/checkout@v3
74+
- uses: actions/checkout@v4
7375
with:
7476
submodules: recursive
7577
- name: Set up cache
76-
uses: actions/cache@v3
78+
uses: actions/cache@v4
7779
with:
7880
path: |
7981
~/PawPawBuilds
8082
key: ${{ matrix.target }}-v${{ env.CACHE_VERSION }}
8183
- name: Restore debian packages cache
84+
shell: bash
8285
run: |
83-
if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
84-
sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \
86+
if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then
87+
sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/;
8588
fi
8689
- name: Fix GitHub's mess
90+
shell: bash
8791
run: |
8892
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
8993
sudo dpkg --add-architecture i386
9094
sudo apt-get update -qq
9195
sudo apt-get install -yqq --allow-downgrades libc6:i386 libgcc-s1:i386 libstdc++6:i386
9296
- name: Set up dependencies
93-
if: ${{ matrix.target == 'win32' }}
94-
run: |
95-
sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 xvfb \
96-
binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386
97-
- name: Set up dependencies
98-
if: ${{ matrix.target == 'win64' }}
97+
shell: bash
9998
run: |
100-
sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 xvfb \
101-
binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable
99+
if [ ! -d PawPaw ]; then
100+
git clone https://github.com/DISTRHO/PawPaw.git
101+
git -C PawPaw checkout ${PAWPAW_VERSION}
102+
fi
103+
sudo ./PawPaw/.github/workflows/bootstrap-deps.sh ${{ matrix.target }}
104+
sudo apt-get install -y build-essential llvm xvfb wine-stable
102105
- name: Cache debian packages
106+
shell: bash
103107
run: |
104-
mkdir -p ~/PawPawBuilds/debs && \
108+
mkdir -p ~/PawPawBuilds/debs
105109
sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/
106110
- name: Bootstrap dependencies
107111
shell: bash
108112
run: |
109-
if [ ! -d PawPaw ]; then
110-
git clone https://github.com/DISTRHO/PawPaw.git
111-
git -C PawPaw checkout ${PAWPAW_VERSION}
112-
fi
113-
./PawPaw/bootstrap-jack2.sh ${{ matrix.target }} && ./PawPaw/.cleanup.sh ${{ matrix.target }}
113+
./PawPaw/bootstrap-jack2.sh ${{ matrix.target }}
114+
./PawPaw/.cleanup.sh ${{ matrix.target }}
114115
- name: Build jack2
115116
shell: bash
116117
run: |
@@ -122,6 +123,7 @@ jobs:
122123
./waf install
123124
- name: Generate MSVC lib files
124125
if: ${{ matrix.target == 'win32' }}
126+
shell: bash
125127
run: |
126128
pushd $(pwd)/destdir/lib
127129
llvm-dlltool -m i386 -D libjack.dll -d libjack.def -l libjack.lib
@@ -130,6 +132,7 @@ jobs:
130132
popd
131133
- name: Generate MSVC lib files
132134
if: ${{ matrix.target == 'win64' }}
135+
shell: bash
133136
run: |
134137
# 32bit
135138
pushd $(pwd)/destdir/lib32
@@ -163,7 +166,7 @@ jobs:
163166
echo "#define VERSION \"${{ github.event.pull_request.number || env.SHA8 }}\"" > version.iss
164167
xvfb-run wine ${WINEPREFIX}/drive_c/InnoSeup/ISCC.exe ${{ matrix.target }}-mini.iss
165168
popd
166-
- uses: actions/upload-artifact@v3
169+
- uses: actions/upload-artifact@v4
167170
with:
168171
name: jack2-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}
169172
path: windows/inno/jack2-*.exe

.github/workflows/lint.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ on:
1010

1111
jobs:
1212
build:
13-
1413
runs-on: ubuntu-latest
1514
steps:
16-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1716
- name: Install dependencies
1817
run: |
19-
sudo apt-get update
20-
sudo apt-get install flake8 findutils
18+
sudo apt-get update -qq
19+
sudo apt-get install -qqy flake8 findutils
2120
- name: Lint with flake8
2221
run: find . -type f \( -iname wscript -or -iname jack_control \) -exec flake8 {} \;

0 commit comments

Comments
 (0)