IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

CI: fix changelog push error (#90971)

Browse Source 
* add --set-upstream origin to release-pr workflow git push

* use a different branch name for the changelog workflow

* disable backport support for now

* remove backport condition
This commit is contained in:
Kevin Minehart 2024-07-25 11:42:41 -05:00 committed by GitHub
parent 4baca6947d
commit 089a5710b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/changelog.yml vendored
View File

@ -73,7 +73,7 @@ jobs:
git config --local user.email "github-actions[bot]@users.noreply.github.com" git config --local user.email "github-actions[bot]@users.noreply.github.com"
git config --local --add --bool push.autoSetupRemote true git config --local --add --bool push.autoSetupRemote true
- name: "Create branch" - name: "Create branch"
run: git checkout -b "release/${{ github.run_id }}/${{ inputs.version }}" run: git checkout -b "changelog/${{ github.run_id }}/${{ inputs.version }}"
- name: "Generate changelog" - name: "Generate changelog"
id: changelog id: changelog
uses: ./.github/workflows/actions/changelog uses: ./.github/workflows/actions/changelog
@ -117,11 +117,11 @@ jobs:
if: ${{ inputs.dry_run }} != true if: ${{ inputs.dry_run }} != true
run: git push run: git push
- name: "Create changelog PR" - name: "Create changelog PR"
if: "${{ inputs.backport == '' }}"
run: > run: >
gh pr create \ gh pr create \
$( [ "x${{ inputs.latest }}" == "xtrue" ] && printf %s '-l "release/latest"') \
--dry-run=${{ inputs.dry_run }} \ --dry-run=${{ inputs.dry_run }} \
--label "no-backport" \
--label "no-changelog" \
-B "${{ inputs.target }}" \ -B "${{ inputs.target }}" \
--title "Release: ${{ inputs.version }}" \ --title "Release: ${{ inputs.version }}" \
--body "Changelog changes for release ${{ inputs.version }}" --body "Changelog changes for release ${{ inputs.version }}"

3
.github/workflows/release-pr.yml vendored
View File

@ -126,7 +126,7 @@ jobs:
- name: Git push - name: Git push
if: ${{ inputs.dry_run }} != true if: ${{ inputs.dry_run }} != true
run: git push run: git push --set-upstream origin release/${{ github.run_id }}/${{ inputs.version }}
- name: Create PR without backports - name: Create PR without backports
if: "${{ inputs.backport == '' }}" if: "${{ inputs.backport == '' }}"
@ -145,7 +145,6 @@ jobs:
run: > run: >
gh pr create \ gh pr create \
$( [ "x${{ inputs.latest }}" == "xtrue" ] && printf %s '-l "release/latest"') \ $( [ "x${{ inputs.latest }}" == "xtrue" ] && printf %s '-l "release/latest"') \
-l "backport ${{ inputs.backport }}" \
-l "product-approved" \ -l "product-approved" \
--dry-run=${{ inputs.dry_run }} \ --dry-run=${{ inputs.dry_run }} \
-B "${{ inputs.target }}" \ -B "${{ inputs.target }}" \