From 0bd5c11a25eb8fad2261723c7982da7eb161db36 Mon Sep 17 00:00:00 2001 From: Clemens Brunner Date: Fri, 20 Mar 2026 10:17:51 +0100 Subject: [PATCH 1/5] Bump actions --- .github/workflows/cppcmake.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cppcmake.yml b/.github/workflows/cppcmake.yml index 7353f90..f9967c2 100644 --- a/.github/workflows/cppcmake.yml +++ b/.github/workflows/cppcmake.yml @@ -22,7 +22,7 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - name: CMake version run: cmake --version @@ -42,7 +42,7 @@ jobs: run: cmake --build build --config Release -j --target package - name: Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v7 # if: "!startsWith(github.ref, 'refs/heads')" with: name: pkg-${{ matrix.config.name }} @@ -59,12 +59,12 @@ jobs: - name: Download Artifacts if: startsWith(github.ref, 'refs/tags/') - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v8 - name: Create Release if: startsWith(github.ref, 'refs/tags/') id: create_release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From f35a7bf76a32c266854f6c8618dbcaf1416278c4 Mon Sep 17 00:00:00 2001 From: Clemens Brunner Date: Fri, 20 Mar 2026 10:19:30 +0100 Subject: [PATCH 2/5] Add Dependabot --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..5ace460 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From fefcdd0a95b635ce84ae654517c638eb8817dc85 Mon Sep 17 00:00:00 2001 From: Clemens Brunner Date: Fri, 20 Mar 2026 10:24:18 +0100 Subject: [PATCH 3/5] Clean up workflows --- .github/workflows/cppcmake.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cppcmake.yml b/.github/workflows/cppcmake.yml index f9967c2..e03f87d 100644 --- a/.github/workflows/cppcmake.yml +++ b/.github/workflows/cppcmake.yml @@ -2,6 +2,8 @@ name: C/C++ CI on: push: + branches: + - main tags: - v*.* pull_request: @@ -11,14 +13,16 @@ on: jobs: build: name: ${{ matrix.config.name }} + permissions: + contents: read runs-on: ${{ matrix.config.os }} strategy: matrix: config: - {name: "ubuntu-latest", os: ubuntu-latest, cmake_extra: ""} - {name: "windows-x64", os: windows-latest, cmake_extra: "-T v143"} - - {name: "windows-32", os: windows-latest, cmake_extra: "-T v143 -A Win32"} - - {name: "macOS-latest", os: macOS-latest, cmake_extra: ""} + - {name: "windows-x32", os: windows-latest, cmake_extra: "-T v143 -A Win32"} + - {name: "macOS-latest", os: macos-latest, cmake_extra: ""} fail-fast: false steps: @@ -43,7 +47,6 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v7 - # if: "!startsWith(github.ref, 'refs/heads')" with: name: pkg-${{ matrix.config.name }} path: | @@ -54,23 +57,22 @@ jobs: release: needs: build + if: startsWith(github.ref, 'refs/tags/') runs-on: ubuntu-latest + permissions: + contents: write steps: - name: Download Artifacts - if: startsWith(github.ref, 'refs/tags/') uses: actions/download-artifact@v8 - + - name: Create Release - if: startsWith(github.ref, 'refs/tags/') id: create_release uses: softprops/action-gh-release@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - # tag_name: ${{ github.ref }} # ${{ github.ref }} is default - name: Release ${{ github.ref }} + name: Release ${{ github.ref_name }} draft: false prerelease: false - # body_path: CHANGELOG.txt files: 'pkg-*/*' From 220f082f8b1fa1246f5eced5de986b87b6bbbd67 Mon Sep 17 00:00:00 2001 From: Clemens Brunner Date: Fri, 20 Mar 2026 10:25:09 +0100 Subject: [PATCH 4/5] Shorter release name --- .github/workflows/cppcmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cppcmake.yml b/.github/workflows/cppcmake.yml index e03f87d..6838db9 100644 --- a/.github/workflows/cppcmake.yml +++ b/.github/workflows/cppcmake.yml @@ -72,7 +72,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - name: Release ${{ github.ref_name }} + name: ${{ github.ref_name }} draft: false prerelease: false files: 'pkg-*/*' From fe1bd93f6de3992a9be78898c3240d4bf9e6d4aa Mon Sep 17 00:00:00 2001 From: Clemens Brunner Date: Fri, 20 Mar 2026 10:27:46 +0100 Subject: [PATCH 5/5] Format --- .github/workflows/cppcmake.yml | 92 +++++++++++++++++----------------- 1 file changed, 47 insertions(+), 45 deletions(-) diff --git a/.github/workflows/cppcmake.yml b/.github/workflows/cppcmake.yml index 6838db9..4a10df7 100644 --- a/.github/workflows/cppcmake.yml +++ b/.github/workflows/cppcmake.yml @@ -3,12 +3,12 @@ name: C/C++ CI on: push: branches: - - main + - main tags: - - v*.* + - v*.* pull_request: branches: - - main + - main jobs: build: @@ -19,42 +19,45 @@ jobs: strategy: matrix: config: - - {name: "ubuntu-latest", os: ubuntu-latest, cmake_extra: ""} - - {name: "windows-x64", os: windows-latest, cmake_extra: "-T v143"} - - {name: "windows-x32", os: windows-latest, cmake_extra: "-T v143 -A Win32"} - - {name: "macOS-latest", os: macos-latest, cmake_extra: ""} + - { name: "ubuntu-latest", os: ubuntu-latest, cmake_extra: "" } + - { name: "windows-x64", os: windows-latest, cmake_extra: "-T v143" } + - { + name: "windows-x32", + os: windows-latest, + cmake_extra: "-T v143 -A Win32", + } + - { name: "macOS-latest", os: macos-latest, cmake_extra: "" } fail-fast: false - + steps: - - uses: actions/checkout@v6 - - - name: CMake version - run: cmake --version - - - name: Configure CMake - shell: bash - run: | - cmake -S . -B build ${{ matrix.config.cmake_extra }} -DCMAKE_INSTALL_PREFIX=${PWD}/build/install -DCPACK_PACKAGE_DIRECTORY=${PWD}/build/package -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=ON - - - name: Make - run: cmake --build build --config Release -j - - - name: Install - run: cmake --build build --config Release -j --target install - - - name: Package - run: cmake --build build --config Release -j --target package - - - name: Upload Artifact - uses: actions/upload-artifact@v7 - with: - name: pkg-${{ matrix.config.name }} - path: | + - uses: actions/checkout@v6 + + - name: CMake version + run: cmake --version + + - name: Configure CMake + shell: bash + run: | + cmake -S . -B build ${{ matrix.config.cmake_extra }} -DCMAKE_INSTALL_PREFIX=${PWD}/build/install -DCPACK_PACKAGE_DIRECTORY=${PWD}/build/package -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=ON + + - name: Make + run: cmake --build build --config Release -j + + - name: Install + run: cmake --build build --config Release -j --target install + + - name: Package + run: cmake --build build --config Release -j --target package + + - name: Upload Artifact + uses: actions/upload-artifact@v7 + with: + name: pkg-${{ matrix.config.name }} + path: | build/package/*.deb build/package/*.tar.bz2 build/package/*.zip - release: needs: build if: startsWith(github.ref, 'refs/tags/') @@ -62,17 +65,16 @@ jobs: permissions: contents: write steps: - - - name: Download Artifacts - uses: actions/download-artifact@v8 + - name: Download Artifacts + uses: actions/download-artifact@v8 - - name: Create Release - id: create_release - uses: softprops/action-gh-release@v2 - env: + - name: Create Release + id: create_release + uses: softprops/action-gh-release@v2 + env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - name: ${{ github.ref_name }} - draft: false - prerelease: false - files: 'pkg-*/*' + with: + name: ${{ github.ref_name }} + draft: false + prerelease: false + files: "pkg-*/*"