From 118702caeee25ccc193c9be025d02c8ad96f7d28 Mon Sep 17 00:00:00 2001 From: Kamil Skwarczynski Date: Wed, 13 May 2026 10:53:31 +0000 Subject: [PATCH 1/2] use composite squash action from core --- .github/workflows/Squash.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/Squash.yml b/.github/workflows/Squash.yml index a5d85f47..a12658e9 100755 --- a/.github/workflows/Squash.yml +++ b/.github/workflows/Squash.yml @@ -26,14 +26,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v6 - with: - ref: ${{ matrix.branch_name }} - fetch-depth: 0 - name: Squash commits - run: | - git config --global user.name "GitHub Actions" - git config --global user.email "actions@github.com" - git reset --soft "$(git rev-list --max-parents=0 HEAD)" - git commit --amend -m "Squashed all commits into one" - git push origin ${{ matrix.branch_name }} --force + uses: mach3-software/MaCh3/.github/actions/squash@develop + with: + branch: ${{ matrix.branch_name }} From 32dfa807869e3a6b82eb72636d3a9f12d3a966c5 Mon Sep 17 00:00:00 2001 From: Kamil <45295406+KSkwarczynski@users.noreply.github.com> Date: Wed, 13 May 2026 12:24:43 +0100 Subject: [PATCH 2/2] Fix compilation flag for NuDock validations --- .github/workflows/CIValidations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CIValidations.yml b/.github/workflows/CIValidations.yml index 4c1f5637..d1440c0a 100644 --- a/.github/workflows/CIValidations.yml +++ b/.github/workflows/CIValidations.yml @@ -43,7 +43,7 @@ jobs: - name: NuDock Validations test: MaCh3CLI --NuDockValidations - compilation_flags: -MaCh3Tutorial_NUDOCK_ENABLED=ON + compilation_flags: -DMaCh3Tutorial_NUDOCK_ENABLED=ON container: image: ghcr.io/mach3-software/mach3:alma9v1.3.0