From 66b719223cf2d782ca5585cc9af7637aa9fad3de Mon Sep 17 00:00:00 2001 From: Jahn Date: Sun, 24 Nov 2024 07:02:48 +0100 Subject: [PATCH 1/2] chore(ci): update upload-artifact action --- .github/workflows/ci-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index e68158b..429ec2f 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -122,14 +122,14 @@ jobs: # ---------- Upload artifacts to github ---------- - name: Upload source-pkg artifact to github if: startsWith(matrix.docker_tag, 'archlinux') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: source-package path: ${{ env.src_pkg_artifact }} - name: Upload version-info to github if: startsWith(matrix.docker_tag, 'archlinux') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: version-info path: | @@ -137,7 +137,7 @@ jobs: ./version-branch - name: Upload binary package artifact to github - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.docker_tag }}-package path: ${{ env.dist_pkg_artifact }} From 4f2c2647bf34f8a3482a564e9fbff79df64b7ddd Mon Sep 17 00:00:00 2001 From: Jahn Date: Sun, 24 Nov 2024 07:09:41 +0100 Subject: [PATCH 2/2] ci: update triggers for ci and codeql builds --- .github/workflows/ci-build.yml | 4 +++- .github/workflows/codeql-analysis.yml | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 429ec2f..5dd4168 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -3,12 +3,14 @@ name: ci-build on: push: branches: - - "**" + - master + - develop pull_request: branches: - master - develop - 'feature/**' + workflow_dispatch: jobs: build: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 388ee41..c81bf48 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,11 +1,11 @@ name: "CodeQL" on: - push: - branches: - - "**" pull_request: branches: [develop, master] + push: + branches: [develop, master] + workflow_dispatch: jobs: analyse: