Merge branch 'apache:master' into master

beryllw · Nov 5, 2024 · edf07ec · edf07ec
2 parents 0f84dc7 + e692e7b
commit edf07ec
Show file tree

Hide file tree

Showing 49 changed files with 3,353 additions and 490 deletions.
diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml
@@ -54,7 +54,7 @@ jobs:
       matrix:
         branch:
           - master
-          - release-3.0
+          - release-3.2
           - release-3.1
 
     steps:
@@ -69,8 +69,8 @@ jobs:
           echo "flink_branch=${currentBranch}" >> ${GITHUB_ENV}
           
           if [ "${currentBranch}" = "master" ]; then
-          echo "flink_alias=release-3.2" >> ${GITHUB_ENV}
-          elif [ "${currentBranch}" = "release-3.1" ]; then
+          echo "flink_alias=release-3.3" >> ${GITHUB_ENV}
+          elif [ "${currentBranch}" = "release-3.2" ]; then
           echo "flink_alias=stable" >> ${GITHUB_ENV}
           fi
 

diff --git a/.github/workflows/close_stale.yml b/.github/workflows/close_stale.yml
@@ -50,7 +50,7 @@ jobs:
             This pull request has been closed because it has not had recent activity. You could reopen it
             if you try to continue your work, and anyone who are interested in it are encouraged to continue
             work on this pull request.
-          close-pr-label: stale
-          remove-pr-stale-when-updated: true
-          remove-issue-stale-when-updated: true
-          labels-to-add-when-unstale: 'waiting for review'
+          # Auto-remove stale has conflicts with existing approve label workflows
+          # and will result in Stale label missing.
+          remove-pr-stale-when-updated: false
+          remove-issue-stale-when-updated: false