More CI handling

Signed-off-by: falkTX <falktx@falktx.com>
mod-audio · Dec 6, 2023 · b3cd0b5 · b3cd0b5
1 parent c7657be
commit b3cd0b5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,9 +3,9 @@ name: build
 on: [push, pull_request]
 
 env:
-  CACHE_VERSION_LINUX: 2
-  CACHE_VERSION_MACOS: 2
-  CACHE_VERSION_WIN64: 2
+  CACHE_VERSION_LINUX: 3
+  CACHE_VERSION_MACOS: 3
+  CACHE_VERSION_WIN64: 3
   DEBIAN_FRONTEND: noninteractive
   PAWPAW_SKIP_TESTS: 1
 
@@ -31,7 +31,7 @@ jobs:
       - name: Set up dependencies
         run: |
           ./src/PawPaw/.github/workflows/bootstrap-deps.sh linux-x86_64
-          apt-get install -yqq libqt5svg5-dev qtbase5-dev qtbase5-dev-tools unzip xdg-user-dirs
+          apt-get install -yqq unzip xdg-user-dirs zip
       - name: Build dependencies
         run: |
           ./src/PawPaw/bootstrap-mod.sh linux-x86_64 && ./src/PawPaw/.cleanup.sh linux-x86_64
@@ -142,7 +142,7 @@ jobs:
       - name: Set up dependencies
         run: |
           ./src/PawPaw/.github/workflows/bootstrap-deps.sh win64
-          apt-get install -yqq unzip xdg-user-dirs xvfb
+          apt-get install -yqq unzip xdg-user-dirs xvfb zip
       - name: Build dependencies
         run: |
           ./src/PawPaw/bootstrap-mod.sh win64 && ./src/PawPaw/.cleanup.sh win64

diff --git a/src/PawPaw b/src/PawPaw
diff --git a/utils/plugin-builder/plugin-builder.mk b/utils/plugin-builder/plugin-builder.mk
@@ -238,5 +238,5 @@ ifeq ($($(PKG)_SITE_METHOD),git)
 	tar --exclude='.git' -czf '$($(PKG)_DLFILE)' -C '$(PAWPAW_TMPDIR)' '$(PAWPAW_TMPNAME)'
 	rm -rf '$(PAWPAW_TMPDIR)'
 else
-	wget -O '$($(PKG)_DLFILE)' '$($(PKG)_DLSITE)'
+	curl -Lo '$($(PKG)_DLFILE)' '$($(PKG)_DLSITE)'
 endif
+27 −26		.github/workflows/bootstrap-deps.sh
+270 −125		.github/workflows/bootstrap.yml
+116 −1		bootstrap-common.sh
+1 −122		bootstrap-mod.sh
+39 −2		bootstrap-qt.sh