-
Notifications
You must be signed in to change notification settings - Fork 273
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
58 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,9 +26,65 @@ jobs: | |
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" | ||
git config --local user.name "github-actions[bot]" | ||
git add something.txt | ||
git commit -m "AUTOMATION: Changelog update" | ||
git commit -m "AUTOMATION: Something" | ||
- name: Push changes | ||
uses: ad-m/github-push-action@master | ||
with: | ||
github_token: ${{ secrets.STREAM_PUBLIC_BOT_TOKEN }} | ||
branch: jcrelease | ||
branch: jcrelease | ||
|
||
release_to_main: | ||
needs: publish | ||
name: Sync main with release | ||
runs-on: ubuntu-22.04 | ||
steps: | ||
- name: Check out code | ||
uses: actions/[email protected] | ||
with: | ||
ref: jcmain | ||
persist-credentials: false | ||
- name: Set up JDK 17 | ||
uses: actions/[email protected] | ||
with: | ||
distribution: adopt | ||
java-version: 17 | ||
- name: Sync main | ||
run: | | ||
git fetch origin jcrelease | ||
git merge --ff-only origin/jcrelease | ||
- name: Push changes | ||
uses: ad-m/github-push-action@master | ||
with: | ||
github_token: ${{ secrets.STREAM_PUBLIC_BOT_TOKEN }} | ||
branch: jcmain | ||
update_changelog: | ||
needs: release_to_main | ||
name: Update Changelog - Model | ||
runs-on: ubuntu-22.04 | ||
steps: | ||
- name: Check out code | ||
uses: actions/[email protected] | ||
with: | ||
ref: jcmain | ||
persist-credentials: false | ||
- name: Set up JDK 17 | ||
uses: actions/[email protected] | ||
with: | ||
distribution: adopt | ||
java-version: 17 | ||
- name: Update changelog | ||
run: ./gradlew changelog-add-model-section | ||
- name: Commit CHANGELOG.md and merge to develop | ||
run: | | ||
echo "else" >> something.txt | ||
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" | ||
git config --local user.name "github-actions[bot]" | ||
git add something.txt | ||
git commit -m "AUTOMATION: Something else" | ||
git checkout -t origin/jcdevelop | ||
git merge --ff jcmain -m "AUTOMATION: Merge main into develop" | ||
- name: Push changes | ||
uses: ad-m/github-push-action@master | ||
with: | ||
github_token: ${{ secrets.STREAM_PUBLIC_BOT_TOKEN }} | ||
branch: jcdevelop |