From dc81751abf620d4889e9febb38c14aeee775d3cd Mon Sep 17 00:00:00 2001 From: Maghuro <1546139+maghuro@users.noreply.github.com> Date: Wed, 23 Sep 2026 23:47:43 +0100 Subject: [PATCH 1/2] Harden pull request source check --- .github/workflows/Check-PRsource.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Check-PRsource.yml b/.github/workflows/Check-PRsource.yml index 4f6babf8..fadb9e99 100644 --- a/.github/workflows/Check-PRsource.yml +++ b/.github/workflows/Check-PRsource.yml @@ -6,13 +6,15 @@ on: - reopened - synchronize - edited + +permissions: {} + jobs: check-branches: runs-on: ubuntu-latest steps: - - name: Check branches + - name: Reject non-dev pull requests to main + if: github.base_ref == 'main' && github.head_ref != 'dev' run: | - if [ ${{ github.head_ref }} != "dev" ] && [ ${{ github.base_ref }} == "main" ]; then - echo "Merge requests to main branch are only allowed from dev branch." - exit 1 - fi + echo "Merge requests to main branch are only allowed from dev branch." + exit 1 From dd33bc3fbca55a2e5857ac54564b6427773edf8f Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 28 Sep 2026 08:19:40 +0000 Subject: [PATCH 2/2] Update SCRIPT_BRANCH to master in MerlinAU.sh and version to 1.6.9 --- MerlinAU.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index 30a495e6..3e3a059b 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -23,7 +23,7 @@ readonly SCRIPT_VERSION=1.6.9 readonly SCRIPT_VERSTAG="26092509" readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## -SCRIPT_BRANCH="dev" +SCRIPT_BRANCH="master" ##----------------------------------------## ## Modified by Martinski W. [2024-Jul-03] ##