Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing Workflow 1.3.2 #315

Merged
merged 6 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions .github/workflows/Create-NewReleases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion MerlinAU.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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] ##
Expand Down