Merge pull request #94 from peb-adr/staging-actions

Add action for cherry-picking staging changes

.github/workflows/create-pr.yml

@@ -27,18 +27,20 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: current-meta-repository
+          ref: ${{ github.ref_name }}
 
       - uses: actions/checkout@v4
         with:
-          repository: OpenSlides/${{ inputs.repository }}
+          repository: ${{ github.repository_owner }}/${{ inputs.repository }}
           path: service-repository
+          ref: ${{ github.ref_name }}
           fetch-depth: 0
           submodules: true
 
       - name: Checkout meta repository commit
         working-directory: service-repository/.git/modules/openslides-meta/
         run: git fetch origin && git checkout ${{ inputs.commit }}
-      
+
       - name: Update repository files
         if: inputs.setup-action != ''
         uses: jenseng/dynamic-uses@v1
@@ -60,8 +62,8 @@ jobs:
           commit-message: Update meta repository
           branch: dep/update-meta-repo
           delete-branch: true
-          title: Update meta repository
-          body: "Triggered by commit [${{ inputs.commit }}](https://github.com/OpenSlides/openslides-meta/commit/${{ inputs.commit }})"
+          title: "Update meta repository (${{ github.ref_name }})"
+          body: "Triggered by commit [${{ inputs.commit }}](https://github.com/${{ github.repository_owner }}/openslides-meta/commit/${{ inputs.commit }})"
           reviewers: ${{ inputs.assignee }}
           assignees: ${{ inputs.assignee }}
           labels: dependencies

.github/workflows/create-prs-for-updates.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - staging/4*
 
 jobs:
   create-pull-requests:

.github/workflows/pick-to-staging.yml

@@ -0,0 +1,66 @@
+name: Cherry pick staging PRs merged into main
+
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - 'main'
+
+
+jobs:
+  create-pr-for-staging:
+    if: |
+      github.event.pull_request.merged == true &&
+      contains(github.event.pull_request.labels.*.name, 'staging')
+    name: Create PR against staging branch
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout main
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          fetch-depth: 2
+
+      - name: Fetch and checkout latest staging branch
+        run: |
+          branch=$(git ls-remote --heads origin 'staging*' | tail -1 | awk 'gsub(".*refs/heads/","")')
+          git fetch origin $branch
+          git checkout $branch
+
+      - name: Set git credentials
+        run: |
+          git config --global user.name openslides-automation
+          git config --global user.email [email protected]
+
+      - name: Cherry-pick new commit
+        id: cherry-pick
+        run: |
+          git fetch origin
+          # -m 1 to also be able to cherry-pick merge commits
+          git cherry-pick -m 1 ${{ github.sha }} || {
+            echo "error=1" >> $GITHUB_OUTPUT
+            git add .
+            git cherry-pick --continue
+          }
+
+      - name: Generate access token
+        uses: tibdex/github-app-token@v2
+        id: generate-token
+        with:
+          app_id: ${{ secrets.AUTOMATION_APP_ID }}
+          private_key: ${{ secrets.AUTOMATION_APP_PRIVATE_KEY }}
+
+      - name: Create or update PR
+        uses: peter-evans/create-pull-request@v6
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          branch: apply/commit-${{ github.sha }}
+          delete-branch: true
+          title: "[Cherry-Pick] ${{ github.event.pull_request.title }}"
+          body: "Triggered by commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }})\n\n${{ steps.cherry-pick.outputs.error && 'There were conflicts during the cherry-pick. These were commited without any resolving. Please resolve them manually and push the result to this branch before merging.' || 'The cherry-pick was successful without any conflicts. You should be able to simply merge this PR.' }}"
+          reviewers: ${{ github.event.pull_request.user.login }}
+          assignees: ${{ github.event.pull_request.user.login }}
+          labels: picked-to-staging
+          milestone: 4