Cherry-pick #5073 #5079 #5080 #5081 #5083 #5085

.github/workflows/build.yaml

@@ -9,6 +9,7 @@ on:
   pull_request:
     branches:
       - master
+      - 'release-v*'
 
 env:
   GO_VERSION: 1.22.4

.github/workflows/build_tool.yaml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - master
+      - 'release-v*'
     paths:
       - tool/**
 

.github/workflows/cherry_pick.yaml

@@ -0,0 +1,25 @@
+name: cherry_pick
+
+on:
+  workflow_dispatch:
+    inputs:
+      releaseBranch:
+        description: 'release branch (e.g. release-v0.48.x)'
+        required: true
+        type: string
+      version:
+        description: 'release version (e.g. v0.48.1)'
+        required: true
+        type: string
+jobs:
+  tool:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: make a cherry-pick PR
+        run: |
+          git config user.name "pipecd-bot"
+          git config user.email "[email protected]"
+          ./hack/cherry-pick.sh -q ${{ inputs.releaseBranch }} $(gh pr list --label cherry-pick --label ${{ inputs.version }} --state merged | awk '{print $1}' | sort | paste -sd ' ' -)
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yaml

@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - master
+      - 'release-v*'
 
 env:
   GO_VERSION: 1.22.4

.github/workflows/test.yaml

@@ -9,6 +9,7 @@ on:
   pull_request:
     branches:
       - master
+      - 'release-v*'
 
 env:
   GO_VERSION: 1.22.4

.github/workflows/test_tool.yaml

@@ -9,6 +9,7 @@ on:
   pull_request:
     branches:
       - master
+      - 'release-v*'
     paths:
       - tool/**
 

Makefile

@@ -170,8 +170,10 @@ lint/web: FIX ?= false
 lint/web:
 ifeq ($(FIX),true)
 	yarn --cwd web lint:fix
+	yarn --cwd web typecheck
 else
 	yarn --cwd web lint
+	yarn --cwd web typecheck
 endif
 
 # Update commands

hack/cherry-pick.sh

@@ -76,7 +76,7 @@ echo
 # Cherry-pick pull requests
 COMMITS=$(join " " "${COMMIT_HASHS[@]}")
 echo "+++ Cherry-picking pull requests"
-git cherry-pick ${COMMITS}
+git cherry-pick -s ${COMMITS}
 echo
 
 # Check whether to push commits and create a pull request or not