Sync with Upstream (create) #31
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
| name: Sync with Upstream (create) | |
| on: | |
| schedule: | |
| - cron: "0 0 1 * *" # Runs at 00:00 on the first day of every month | |
| workflow_dispatch: | |
| permissions: | |
| contents: write | |
| pull-requests: write | |
| id-token: write | |
| jobs: | |
| sync: | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Retrieve secrets | |
| uses: grafana/shared-workflows/actions/get-vault-secrets@main | |
| with: | |
| repo_secrets: | | |
| APP_ID=app:id | |
| APP_PRIVATE_KEY=app:private-key | |
| - name: Generate a token | |
| id: generate-token | |
| uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0 | |
| with: | |
| app-id: ${{ env.APP_ID }} | |
| private-key: ${{ env.APP_PRIVATE_KEY }} | |
| - name: Checkout the repository | |
| uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 | |
| with: | |
| fetch-depth: 0 | |
| ref: main | |
| token: ${{ steps.generate-token.outputs.token }} | |
| - name: Create new branch from main | |
| run: | | |
| git checkout -b sync-upstream-${{ github.run_number }} | |
| - name: Configure Git | |
| run: | | |
| git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" | |
| git config --local user.name "github-actions[bot]" | |
| - name: Pull changes from upstream and merge | |
| id: merge | |
| run: | | |
| git remote add upstream https://github.com/actions/runner-images.git | |
| git fetch upstream | |
| SHA="$(git rev-parse upstream/main)" | |
| echo "upstream-sha=$SHA" >> $GITHUB_OUTPUT | |
| if ! git merge -m "Merge commit '$SHA' from actions/runner-images" "${SHA}"; then | |
| echo "conflicts=true" >> $GITHUB_OUTPUT | |
| fi | |
| - name: Handle conflicts with empty commit | |
| if: steps.merge.outputs.conflicts == 'true' | |
| run: | | |
| git merge --abort | |
| git commit --allow-empty -m "Empty commit due to merge conflicts" | |
| - name: Push changes to new branch | |
| run: | | |
| git push --force-with-lease origin sync-upstream-${{ github.run_number }} | |
| - name: Set PR body | |
| id: pr-body | |
| env: | |
| GITHUB_SERVER_URL: "${{ github.server_url }}" | |
| GITHUB_REPOSITORY: "${{ github.repository }}" | |
| GITHUB_RUN_ID: "${{ github.run_id }}" | |
| GITHUB_RUN_NUMBER: "${{ github.run_number }}" | |
| UPSTREAM_SHA: "${{ steps.merge.outputs.upstream-sha }}" | |
| PR_BODY_NO_CONFLICTS_TEMPLATE: ".github/workflows/sync-upstream/templates/pr-body-no-conflicts.txt" | |
| PR_BODY_WITH_CONFLICTS_TEMPLATE: ".github/workflows/sync-upstream/templates/pr-body-with-conflicts.txt" | |
| run: | | |
| echo 'body<<EOF' >> $GITHUB_OUTPUT | |
| if [ "${{ steps.merge.outputs.conflicts }}" == "true" ]; then | |
| envsubst < $PR_BODY_WITH_CONFLICTS_TEMPLATE >> $GITHUB_OUTPUT | |
| else | |
| envsubst < $PR_BODY_NO_CONFLICTS_TEMPLATE >> $GITHUB_OUTPUT | |
| fi | |
| echo EOF >> $GITHUB_OUTPUT | |
| - name: Create pull request | |
| env: | |
| GH_TOKEN: ${{ github.token }} | |
| run: | | |
| gh pr create --title 'Update from upstream' \ | |
| --body '${{ steps.pr-body.outputs.body }}' \ | |
| --base main --head sync-upstream-${{ github.run_number }} \ | |
| --repo ${{ github.repository }} \ | |
| || \ | |
| gh pr edit sync-upstream-${{ github.run_number }} \ | |
| --repo ${{ github.repository }} \ | |
| --body '${{ steps.pr-body.outputs.body }}' |