From 4e355bb58bad70c9154bb3821897fd67e345ede0 Mon Sep 17 00:00:00 2001 From: Mehrad Mahmoudian Date: Sun, 28 Apr 2024 12:36:14 +0300 Subject: [PATCH 1/4] bump run-vcpkg action version --- .github/workflows/Windows-pack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Windows-pack.yml b/.github/workflows/Windows-pack.yml index 9504d684bb..dfee3688cc 100644 --- a/.github/workflows/Windows-pack.yml +++ b/.github/workflows/Windows-pack.yml @@ -81,7 +81,7 @@ jobs: echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*FLAMESHOT_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV - name: Restore from cache and run vcpkg - uses: lukka/run-vcpkg@v4 + uses: lukka/run-vcpkg@v11 with: vcpkgArguments: ${{env.VCPKG_PACKAGES}} vcpkgDirectory: '${{ github.workspace }}\vcpkg' From 4771cb9e53e75464cc2fce2ca0427bdbdfadfc5b Mon Sep 17 00:00:00 2001 From: Mehrad Mahmoudian Date: Sun, 28 Apr 2024 12:55:38 +0300 Subject: [PATCH 2/4] make windows CI to run on demand --- .github/workflows/Windows-pack.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Windows-pack.yml b/.github/workflows/Windows-pack.yml index dfee3688cc..2261e16159 100644 --- a/.github/workflows/Windows-pack.yml +++ b/.github/workflows/Windows-pack.yml @@ -1,9 +1,10 @@ name: Packaging(Windows) on: + workflow_dispatch push: branches: - - master* + - master paths-ignore: - 'README.md' - 'LICENSE' From c1fb69856d4140ac5391e7d8e1ad11d3c9e70276 Mon Sep 17 00:00:00 2001 From: Mehrad Mahmoudian Date: Sun, 28 Apr 2024 13:00:44 +0300 Subject: [PATCH 3/4] fix the workflow_dispatch syntax --- .github/workflows/Windows-pack.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Windows-pack.yml b/.github/workflows/Windows-pack.yml index 2261e16159..8afaec104e 100644 --- a/.github/workflows/Windows-pack.yml +++ b/.github/workflows/Windows-pack.yml @@ -1,7 +1,6 @@ name: Packaging(Windows) on: - workflow_dispatch push: branches: - master @@ -13,6 +12,8 @@ on: paths-ignore: - 'README.md' - 'LICENSE' + workflow_dispatch: + env: PRODUCT: flameshot From b98e96be13bebd930010781ed22e79ebcce64dc5 Mon Sep 17 00:00:00 2001 From: Mehrad Mahmoudian Date: Sun, 28 Apr 2024 13:06:40 +0300 Subject: [PATCH 4/4] add fix* branches to Windows CI --- .github/workflows/Windows-pack.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Windows-pack.yml b/.github/workflows/Windows-pack.yml index 8afaec104e..a7ac435022 100644 --- a/.github/workflows/Windows-pack.yml +++ b/.github/workflows/Windows-pack.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - fix* paths-ignore: - 'README.md' - 'LICENSE'