CI fixes

Signed-off-by: falkTX <falktx@falktx.com>
mod-audio · Oct 16, 2023 · 75b62b9 · 75b62b9
1 parent 8aecfad
commit 75b62b9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Set up dependencies
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -yqq --allow-downgrades libasound2-dev libdbus-1-dev libgl1-mesa-dev libglib2.0-dev libpcre3-dev libqt5svg5-dev libxcb1-dev libxcursor-dev libxext-dev libxfixes-dev libxrandr-dev libxrender-dev meson uuid-dev
+          sudo apt-get install -yqq --allow-downgrades gperf libasound2-dev libdbus-1-dev libgl1-mesa-dev libglib2.0-dev libpcre3-dev libqt5svg5-dev libxcb1-dev libxcursor-dev libxext-dev libxfixes-dev libxrandr-dev libxrender-dev meson uuid-dev
       - name: Build dependencies
         run: |
           ./PawPaw/bootstrap-mod.sh linux-x86_64 && ./PawPaw/.cleanup.sh linux-x86_64
@@ -107,7 +107,7 @@ jobs:
           sudo apt-get update -qq
       - name: Set up dependencies
         run: |
-          sudo apt-get install -yqq --allow-downgrades autopoint binutils-mingw-w64-x86-64 libc6:i386 libgcc-s1:i386 libstdc++6:i386 g++-mingw-w64-x86-64 gperf meson mingw-w64 wine-stable
+          sudo apt-get install -yqq --allow-downgrades autopoint binutils-mingw-w64-x86-64 libc6:i386 libgcc-s1:i386 libstdc++6:i386 g++-mingw-w64-x86-64 gperf meson mingw-w64 wine-stable xvfb
       - name: Build dependencies
         run: |
           ./PawPaw/bootstrap-mod.sh win64 && ./PawPaw/.cleanup.sh win64
@@ -118,7 +118,7 @@ jobs:
       - name: Pack
         if: steps.cache.outputs.cache-hit == 'true'
         run: |
-          ./utils/win64-installer.sh
+          xvfb-run ./utils/win64-installer.sh
           mv mod-app-*.exe mod-app-${{ github.event.pull_request.number || env.SHA8 }}-win64.exe
       - uses: actions/upload-artifact@v3
         with:

diff --git a/PawPaw b/PawPaw
diff --git a/utils/plugin-builder.mk b/utils/plugin-builder.mk
@@ -186,17 +186,17 @@ $(STAMP_INSTALLED): $(STAMP_BUILT)
 $(STAMP_BUILT): $(STAMP_CONFIGURED)
 ifeq ($(MACOS),true)
 	$(foreach p,$(wildcard $($(PKG)_BUILDDIR)/Makefile $($(PKG)_BUILDDIR)/*/makefile),\
-		sed -i 's/-Wl,--gc-sections//g' $(p);)
+		sed -i -e 's/-Wl,--gc-sections//g' $(p);)
 	$(foreach p,$(wildcard $($(PKG)_BUILDDIR)/Makefile),\
-		sed -i 's/-Wl,--as-needed//g' $(p);)
+		sed -i -e 's/-Wl,--as-needed//g' $(p);)
 	$(foreach p,$(wildcard $($(PKG)_BUILDDIR)/*/makefile),\
-		sed -i 's/-Wl,--no-undefined//g' $(p);)
+		sed -i -e 's/-Wl,--no-undefined//g' $(p);)
 	$(foreach p,$(wildcard $($(PKG)_BUILDDIR)/*/makefile),\
-		sed -i 's/-Wl,--exclude-libs,ALL//g' $(p);)
+		sed -i -e 's/-Wl,--exclude-libs,ALL//g' $(p);)
 	$(foreach p,$(wildcard $($(PKG)_BUILDDIR)/*/makefile),\
-		sed -i 's/-Wl,-z,relro,-z,now//g' $(p);)
+		sed -i -e 's/-Wl,-z,relro,-z,now//g' $(p);)
 	$(foreach p,$(wildcard $($(PKG)_BUILDDIR)/*/makefile),\
-		sed -i 's/-Wl,-z,noexecstack//g' $(p);)
+		sed -i -e 's/-Wl,-z,noexecstack//g' $(p);)
 endif
 	$($(PKG)_BUILD_CMDS)
 	touch $@