From b3cd0b529449c07c4bb7849002638985f69b84eb Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 6 Dec 2023 10:31:37 +0100 Subject: [PATCH] More CI handling Signed-off-by: falkTX --- .github/workflows/build.yml | 10 +++++----- src/PawPaw | 2 +- utils/plugin-builder/plugin-builder.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ecfb2fc..85fb2f6 100644 --- 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 index f845177..d5e9073 160000 --- a/src/PawPaw +++ b/src/PawPaw @@ -1 +1 @@ -Subproject commit f8451771974da73f80caa4300deabdf991ccdfe4 +Subproject commit d5e9073c000d6745b531c1c1ae7a581e722d7690 diff --git a/utils/plugin-builder/plugin-builder.mk b/utils/plugin-builder/plugin-builder.mk index c68a357..8f6ead9 100644 --- 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