Conversation
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Comment on lines
+9
to
+53
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout main branch | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| ref: main | ||
| - name: Fetch upstream | ||
| run: git fetch upstream/main | ||
| - name: Merge upstream/main into main | ||
| id: merge | ||
| run: | | ||
| git merge upstream/main | ||
| if [ -z "$(git log origin/main..HEAD)" ]; then | ||
| echo "::set-output name=new-commits::false" | ||
| else | ||
| echo "::set-output name=new-commits::true" | ||
| fi | ||
| - name: Check for merge conflicts | ||
| if: steps.merge.outputs.new-commits == 'true' | ||
| run: | | ||
| if git diff --quiet; then | ||
| echo "No merge conflicts" | ||
| else | ||
| echo "Merge conflicts found" | ||
| git diff | ||
| exit 1 | ||
| fi | ||
| - name: Create new branch and push changes | ||
| id: create-branch | ||
| if: steps.merge.outputs.new-commits == 'true' | ||
| run: | | ||
| BRANCH_NAME="forward-integration-$(date +%Y%m%d%H%M%S)" | ||
| git checkout -b $BRANCH_NAME | ||
| git push origin $BRANCH_NAME | ||
| echo "::set-output name=BRANCH_NAME::$BRANCH_NAME" | ||
| - name: Create pull request | ||
| if: steps.merge.outputs.new-commits == 'true' | ||
| uses: peter-evans/create-pull-request@v3 | ||
| with: | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
| commit-message: 'Forward integration from upstream/main' | ||
| branch: ${{ steps.create-branch.outputs.BRANCH_NAME }} | ||
| base: main | ||
| title: 'Forward integration from upstream/main' | ||
| body: 'This is an automated pull request to integrate changes from upstream/main' |
Check warning
Code scanning / CodeQL
Workflow does not contain permissions Medium
| echo "::set-output name=BRANCH_NAME::$BRANCH_NAME" | ||
| - name: Create pull request | ||
| if: steps.merge.outputs.new-commits == 'true' | ||
| uses: peter-evans/create-pull-request@v3 |
Check warning
Code scanning / CodeQL
Unpinned tag for a non-immutable Action in workflow Medium
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.