diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml index 7fa0f44f..46e1d8ea 100644 --- a/.github/workflows/Create-NewReleases.yml +++ b/.github/workflows/Create-NewReleases.yml @@ -69,20 +69,28 @@ jobs: - name: Commit Changes run: | - if ! git diff-index --quiet HEAD --; then + if ! git diff --cached --quiet; then git commit -m "Update SCRIPT_BRANCH to master in MerlinAU.sh and version to ${{ steps.nextver.outputs.tag }}" else echo "No changes to commit" fi + # Set up authentication with PAT for pushing to the protected branch + - name: Set up authentication with PAT for Push + run: | + git remote set-url origin https://${{ secrets.PAT_USERNAME }}:${{ secrets.PAT_TOKEN }}@github.com/${{ github.repository }}.git + + # Push the changes using the PAT - name: Push Changes run: git push origin main - + + # Push the tag using the PAT - name: Create and Push Tag run: | git tag ${{ steps.nextver.outputs.tag }} git push origin ${{ steps.nextver.outputs.tag }} - + + # Use GITHUB_TOKEN to create the release - name: Create Release with Automated Release Notes uses: softprops/action-gh-release@v2.0.8 with: diff --git a/MerlinAU.sh b/MerlinAU.sh index 7d16fa34..41b801ab 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -12,7 +12,7 @@ set -u readonly SCRIPT_VERSION=1.3.2 readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## -SCRIPT_BRANCH="master" +SCRIPT_BRANCH="dev" ##----------------------------------------## ## Modified by Martinski W. [2024-Jul-03] ##