generated from FabricMC/fabric-example-mod
-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #286 from boholder/fix-workflow
build: try to fix fast-forward workflow
- Loading branch information
Showing
1 changed file
with
9 additions
and
9 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 |
---|---|---|
|
@@ -52,8 +52,8 @@ jobs: | |
|
||
- name: Set environment variables | ||
run: | | ||
MERGE_STATUS=${{ fromJson(steps.get-pr-details.outputs.data).mergeable_state }} | ||
if [ "$MERGE_STATUS" != "clean" ]; then echo "COMMENT=[Fast Forward CI] ${{ env.HEAD_REF }} cannot be merged into ${{ env.BASE_REF }} at the moment." >> $GITHUB_ENV; fi | ||
MERGE_STATUS=${{ fromJson(steps.get-pr-details.outputs.data).mergeable }} | ||
if $MERGE_STATUS; then echo "COMMENT=\[Fast Forward CI\] ${{ env.HEAD_REF }} cannot be merged into ${{ env.BASE_REF }} at the moment." >> $GITHUB_ENV; fi | ||
echo "MERGE_STATUS=$MERGE_STATUS" >> $GITHUB_ENV | ||
echo "BASE_REF=${{ fromJson(steps.get-pr-details.outputs.data).base.ref }}" >> $GITHUB_ENV | ||
echo "HEAD_REF=${{ fromJson(steps.get-pr-details.outputs.data).head.ref }}" >> $GITHUB_ENV | ||
|
@@ -62,7 +62,7 @@ jobs: | |
# Only runs if the merge status is "clean", clean might refer to when the merge button is green in the PR's page, there's no clear indication of it's values in docs | ||
# For forks the following script adds the fork as a remote, them merges it into base | ||
- name: Merge the head branch into base in a fast forward manner only | ||
if: ${{ env.MERGE_STATUS == 'clean' }} | ||
if: ${{ env.MERGE_STATUS }} | ||
run: | | ||
git config --global user.email "[email protected]" | ||
git config --global user.name "GitHub Action" | ||
|
@@ -84,7 +84,7 @@ jobs: | |
# Cuts the lines before "## Changelog" line in the PR's body using the "sed" command | ||
# Ref: https://stackoverflow.com/a/35966027 | ||
- name: Copy the changelogs from pr message to latest.md | ||
if: ${{ env.MERGE_STATUS == 'clean' }} | ||
if: ${{ env.MERGE_STATUS }} | ||
run: | | ||
cd ./doc/changelogs | ||
echo "$ISSUE_BODY" > pr_msg.txt | ||
|
@@ -96,21 +96,21 @@ jobs: | |
|
||
# Commit the changes if there was no error i.e., there was no issue in fetching the files and there was actually a changelog found/copied | ||
- name: Commit the changes (if any) | ||
if: ${{ env.MERGE_STATUS == 'clean' }} | ||
if: ${{ env.MERGE_STATUS }} | ||
run: | | ||
if [[ "$( tail ./response.txt -n 1 )" = "No changes to write\!" ]] || [[ "$( tail ./response.txt -n 1 )" =~ "File \`(.*?)\` not found\!" ]]; then | ||
echo "COMMENT=${{ env.COMMENT }}\nNo changelogs found..." >> $GITHUB_ENV | ||
else | ||
git add doc/changelogs/latest.md | ||
git commit -m "chore(ff ci): add changelogs from #${{ github.event.issue.number }} to CHANGELOG.md" | ||
echo "COMMENT=${{ env.COMMENT }}\nCopied the changelogs from pull request body to doc/CHANGELOG.md..." >> $GITHUB_ENV | ||
echo "COMMENT=${{ env.COMMENT }} Copied the changelogs from pull request body to doc/CHANGELOG.md..." >> $GITHUB_ENV | ||
fi | ||
- name: Push to origin | ||
if: ${{ env.MERGE_STATUS == 'clean' }} | ||
if: ${{ env.MERGE_STATUS }} | ||
run: | | ||
git push origin | ||
echo "COMMENT=${{ env.COMMENT }}\nPushed the changes to origin." >> $GITHUB_ENV | ||
echo "COMMENT=${{ env.COMMENT }} Pushed the changes to origin." >> $GITHUB_ENV | ||
# Post a success/failure comment to the PR. | ||
- name: Add success/failure comment to PR | ||
|
@@ -133,4 +133,4 @@ jobs: | |
issue_number: ${{ github.event.issue.number }} | ||
body: \[Fast Forward CI\] PR cannot be merged in. Check the Actions tab for details. | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |