Skip to content

Commit df9549e

Browse files
committed
Linux build fix
1 parent 8bef305 commit df9549e

2 files changed

Lines changed: 21 additions & 39 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -135,25 +135,34 @@ jobs:
135135
steps:
136136
- name: Install Dependencies (dnf)
137137
if: ${{ matrix.pacman == 'dnf' }}
138-
run: dnf install -y git cmake alsa-lib-devel libXinerama-devel freetype-devel curl libcurl-devel wget bzip2 gcc-c++ libXi-devel libXcomposite-devel freeglut-devel libXrandr-devel libXcursor-devel xz ccache python python3-pip jack-audio-connection-kit-devel libatomic unzip
138+
run: dnf install -y git cmake alsa-lib-devel libXinerama-devel freetype-devel curl libcurl-devel wget bzip2 gcc-c++ libXi-devel libXcomposite-devel freeglut-devel libXrandr-devel libXcursor-devel xz ccache python python3-pip jack-audio-connection-kit-devel libatomic unzip ninja
139139

140140
- name: Install Dependencies (apt)
141141
if: ${{ matrix.pacman == 'apt' }}
142-
run: apt update && DEBIAN_FRONTEND=noninteractive TZ="Europe/Amsterdam" apt install -y cmake git wget bzip2 build-essential libasound2-dev libjack-jackd2-dev curl libcurl4-openssl-dev libfreetype6-dev libx11-dev libxi-dev libxcomposite-dev libxcursor-dev libxcursor-dev libxext-dev libxrandr-dev libxinerama-dev ccache python3 python3-pip freeglut3-dev unzip
142+
run: apt update && DEBIAN_FRONTEND=noninteractive TZ="Europe/Amsterdam" apt install -y cmake git wget bzip2 build-essential libasound2-dev libjack-jackd2-dev curl libcurl4-openssl-dev libfreetype6-dev libx11-dev libxi-dev libxcomposite-dev libxcursor-dev libxcursor-dev libxext-dev libxrandr-dev libxinerama-dev ccache python3 python3-pip freeglut3-dev unzip ninja
143143

144144
- name: Install Dependencies (zypper)
145145
if: ${{ matrix.pacman == 'zypper' }}
146-
run: zypper refresh && zypper install -y git rsync wget bzip2 xz tar cmake alsa-devel libXinerama-devel libXi-devel libcurl-devel libXcomposite-devel freeglut-devel libXrandr-devel libXcursor-devel freetype2-devel gcc gcc-c++ curl ccache python3 libjack-devel gawk unzip
146+
run: zypper refresh && zypper install -y git rsync wget bzip2 xz tar cmake alsa-devel libXinerama-devel libXi-devel libcurl-devel libXcomposite-devel freeglut-devel libXrandr-devel libXcursor-devel freetype2-devel gcc gcc-c++ curl ccache python3 libjack-devel gawk unzip ninja
147147

148148
- name: Install Dependencies (pacman)
149149
if: ${{ matrix.pacman == 'pacman' }}
150-
run: pacman -Sy && pacman -S --noconfirm cmake wget bzip2 git alsa-lib freetype2 libx11 libxcursor libxi libxext libxinerama libxrandr libxrender webkit2gtk cmake make gcc pkgconf python python-pip curl ccache freeglut mesa glfw-x11 glew jack2 openssl unzip && pacman --noconfirm -Syu
150+
run: pacman -Sy && pacman -S --noconfirm cmake wget bzip2 git alsa-lib freetype2 libx11 libxcursor libxi libxext libxinerama libxrandr libxrender webkit2gtk cmake make gcc pkgconf python python-pip curl ccache freeglut mesa glfw-x11 glew jack2 openssl unzip ninja && pacman --noconfirm -Syu
151151

152152
- uses: actions/checkout@v4
153153
with:
154154
submodules: recursive
155155
fetch-depth: 0
156156

157+
- name: Update cmake
158+
working-directory: ${{github.workspace}}
159+
run: ./.github/scripts/install-cmake.sh
160+
161+
- name: ccache
162+
uses: hendrikmuhs/ccache-action@v1.2
163+
with:
164+
key: ${{ matrix.name }}
165+
157166
- name: Build plugins
158167
run: |
159168
python3 ./build.py --compiler-launcher ccache
@@ -197,11 +206,11 @@ jobs:
197206
steps:
198207
- name: Install Dependencies (dnf)
199208
if: ${{ matrix.pacman == 'dnf' }}
200-
run: dnf install -y git cmake alsa-lib-devel libXinerama-devel freetype-devel curl libcurl-devel wget bzip2 gcc-c++ libXi-devel libXcomposite-devel freeglut-devel libXrandr-devel libXcursor-devel xz ccache python python3-pip jack-audio-connection-kit-devel libatomic unzip
209+
run: dnf install -y git cmake alsa-lib-devel libXinerama-devel freetype-devel curl libcurl-devel wget bzip2 gcc-c++ libXi-devel libXcomposite-devel freeglut-devel libXrandr-devel libXcursor-devel xz ccache python python3-pip jack-audio-connection-kit-devel libatomic unzip ninja
201210

202211
- name: Install Dependencies (apt)
203212
if: ${{ matrix.pacman == 'apt' }}
204-
run: apt update && DEBIAN_FRONTEND=noninteractive TZ="Europe/Amsterdam" apt install -y cmake git wget bzip2 build-essential libasound2-dev libjack-jackd2-dev curl libcurl4-openssl-dev libfreetype6-dev libx11-dev libxi-dev libxcomposite-dev libxcursor-dev libxcursor-dev libxext-dev libxrandr-dev libxinerama-dev ccache python3 python3-pip freeglut3-dev unzip
213+
run: apt update && DEBIAN_FRONTEND=noninteractive TZ="Europe/Amsterdam" apt install -y cmake git wget bzip2 build-essential libasound2-dev libjack-jackd2-dev curl libcurl4-openssl-dev libfreetype6-dev libx11-dev libxi-dev libxcomposite-dev libxcursor-dev libxcursor-dev libxext-dev libxrandr-dev libxinerama-dev ccache python3 python3-pip freeglut3-dev unzip ninja
205214

206215
- uses: actions/checkout@v4
207216
with:
@@ -217,40 +226,13 @@ jobs:
217226
with:
218227
key: ${{ matrix.name }}
219228

220-
- name: Configure
221-
working-directory: ${{github.workspace}}
222-
run: mkdir build && cd build && CXX=g++ cmake -DNANOVG_GLES_IMPLEMENTATION=1 -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. -G "Unix Makefiles"
223-
224-
- name: Build
225-
working-directory: ${{github.workspace}}/build
226-
run: cmake --build . --config $BUILD_TYPE
227-
228-
- name: Prepare Artefacts
229-
working-directory: ${{github.workspace}}
230-
run: ./.github/scripts/package-Linux.sh plugdata-${{ matrix.name }}.tar.xz
231-
232-
- name: Upload to Cloud Storage
233-
if: github.ref == 'refs/heads/develop'
229+
- name: Build plugins
234230
run: |
235-
curl "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o "awscliv2.zip"
236-
unzip awscliv2.zip
237-
./aws/install
238-
aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY }}
239-
aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_KEY }}
240-
aws configure set default.region eu-north-1
241-
aws s3 cp ./plugdata-${{ matrix.name }}.tar.xz s3://plugdata-nightly/
242-
aws s3 cp ./plugdata-${{ matrix.name }}.tar.xz.txt s3://plugdata-nightly/
231+
python3 ./build.py --compiler-launcher ccache
232+
move Build Build-${{ matrix.name }}
243233
244234
- name: Archive Artifacts
245235
uses: actions/upload-artifact@v4
246236
with:
247-
name: plugdata-${{ matrix.name }}
248-
path: plugdata-${{ matrix.name }}.tar.xz
249-
250-
- name: Release Artifacts
251-
uses: softprops/action-gh-release@v1
252-
if: startsWith(github.ref, 'refs/tags/')
253-
with:
254-
prerelease: true
255-
draft: true
256-
files: plugdata-${{ matrix.name }}
237+
name: Build-${{ matrix.name }}
238+
path: Build-${{ matrix.name }}

plugdata

0 commit comments

Comments
 (0)