Skip to content

Commit

Permalink
build: fix cherry picking (#3181)
Browse files Browse the repository at this point in the history
(cherry picked from commit 372e425)
  • Loading branch information
jeripeierSBB committed Oct 28, 2024
1 parent 9a752f0 commit 8d6d3d3
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 64 deletions.
62 changes: 0 additions & 62 deletions .github/workflows/maintenance-changelog.yml

This file was deleted.

7 changes: 5 additions & 2 deletions .github/workflows/maintenance-cherry-pick.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
name: cherry-pick into target branches
name: Cherry-pick into target branches

on:
pull_request:
types: [closed]
types:
- closed
branches:
- main

permissions:
actions: write
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,16 @@ jobs:
env:
VERSION: ${{ steps.release.outputs.version }}

- name: Get token
id: get_token
uses: tibdex/github-app-token@v2
with:
app_id: ${{ secrets.MAINTENANCE_APP_ID }}
private_key: ${{ secrets.MAINTENANCE_APP_PEM }}
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ steps.get_token.outputs.app_token }}
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
Expand Down Expand Up @@ -98,3 +105,20 @@ jobs:
docker push $IMAGE_REPO_STORYBOOK:dev
env:
DOCKER_BUILDKIT: 1

- name: Cherry-pick CHANGELOG.md into ${{ github.event.repository.default_branch }}
if: ${{ steps.release.outputs.release_created && github.ref_name != 'main' }}
run: |
git config user.email "[email protected]"
git config user.name "github-actions"
git checkout ${{ github.event.repository.default_branch }}
git show ${{ github.sha }} -- CHANGELOG.md | git apply -
git commit -a -m "chore: update changelog"
git push
- name: Update maintenance issue
if: ${{ steps.release.outputs.release_created && failure() }}
run: yarn ts-hooks scripts/update-maintenance-issue.ts
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
FAILED_RELEASE: ${{ steps.release.outputs.version }}

0 comments on commit 8d6d3d3

Please sign in to comment.