Merge fdf45e9 into 5854f4a

Author: ydbot

Diff for: .github/actions/update_changelog/update_changelog.py

@@ -169,7 +169,7 @@ def fetch_user_details(username):
     response.raise_for_status()
     return response.json()
 
-if __name__ == "__main__":
+def main():
     if len(sys.argv) != 5:
         print("Usage: update_changelog.py <pr_data_file> <changelog_path> <base_branch> <suffix>")
         sys.exit(1)
@@ -187,6 +187,10 @@ def fetch_user_details(username):
         sys.exit(1)
 
     pr_data = []
+    if not pr_ids:
+        print("::notice::No PR IDs found in the provided file.")
+        return 
+    
     for pr in pr_ids:
         try:
             pr_details = fetch_pr_details(pr["id"])
@@ -212,13 +216,18 @@ def fetch_user_details(username):
     while branch_exists(branch_name):
         branch_name = f"{base_branch_name}-{index}"
         index += 1
+    run_command(f"git checkout -b {base_branch}")
     run_command(f"git checkout -b {branch_name}")
     run_command(f"git add {changelog_path}")
     run_command(f"git commit -m \"Update CHANGELOG.md for {suffix}\"")
     run_command(f"git push origin {branch_name}")
 
-    pr_title = f"Update CHANGELOG.md for {suffix}"
+    pr_title = f"Update CHANGELOG.md for {base_branch}:{suffix}"
     pr_body = f"This PR updates the CHANGELOG.md file for {suffix}."
     pr_create_command = f"gh pr create --title \"{pr_title}\" --body \"{pr_body}\" --base {base_branch} --head {branch_name}"
     pr_url = run_command(pr_create_command)
     # run_command(f"gh pr edit {pr_url} --add-assignee galnat") # TODO: Make assignee customizable
+
+
+if __name__ == "__main__":
+    main()

Diff for: .github/workflows/weekly_update_changelog.yml

@@ -3,22 +3,49 @@ name: Weekly Changelog Update
 on:
   schedule:
     - cron: '0 0 * * 0' # Every Sunday at 00:00
-      branches:
-        - main
-        - stable-*
   workflow_dispatch:
 env:
   GH_TOKEN: ${{ secrets.YDBOT_TOKEN }}
 
 jobs:
+  gather-branches:
+    runs-on: ubuntu-latest
+
+    outputs:
+      branches: ${{ steps.branch-list.outputs.branches }}
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+        
+      - name: List 'main' and 'stable-*' branches
+        id: branch-list
+        run: |
+          git fetch --all
+          BRANCHES=$(git branch -r | grep -E "origin/(main|stable-25(-[0-9]+)*)$" | grep -v HEAD | sed "s/origin\///" | xargs | tr -d '\n' | jq -R -s -c "split(\" \")")
+          echo "::notice:: BRANCHES $BRANCHES"
+          if [ -z "$BRANCHES" ]; then
+            BRANCHES="[]"
+          fi
+          echo "$BRANCHES" > branches.json
+          echo "branches=$BRANCHES" >> "$GITHUB_OUTPUT"
+
   gather-prs:
     runs-on: ubuntu-latest
+    needs: gather-branches
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: ${{ fromJson(needs.gather-branches.outputs.branches) }}
     outputs:
       prs: ${{ steps.pr-list.outputs.prs }}
+      base_branch: ${{ steps.branch-name.outputs.base_branch }}
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
-
+        with:
+           ref: ${{ github.ref }}
+           
       - name: Set up date range
         id: date-setup
         run: |
@@ -28,32 +55,26 @@ jobs:
       - name: Get merged PRs
         id: pr-list
         run: |
-          echo "::notice:: branch = ${GITHUB_REF_NAME}, date = $LAST_WEEK_DATE"
-          PRS=$(gh pr list --state merged --json number,title,baseRefName,mergedAt --jq ".[] | select(.baseRefName == \"${GITHUB_REF_NAME}\" and .mergedAt >= \"$LAST_WEEK_DATE\") | {id: .number}" | jq -c -s ".")
+          REF_NAME=${{ matrix.branch }}
+          echo "::notice:: branch = $REF_NAME, date = $LAST_WEEK_DATE"
+          PRS=$(gh pr list --state merged --json number,title,baseRefName,mergedAt --jq ".[] | select(.baseRefName == \"$REF_NAME\" and .mergedAt >= \"$LAST_WEEK_DATE\") | {id: .number}" | jq -c -s ".")
 
           if [ -z "$PRS" ]; then
             PRS="[]"
           fi
-          echo "$PRS" > prs.json
+          echo "$PRS" > prs-${{ matrix.branch }}.json
+          echo "PRS=$PRS" >> $GITHUB_ENV          
           echo "prs=$PRS" >> "$GITHUB_OUTPUT"
 
       - name: Debug PR list output
         run: |
-          cat prs.json
+          cat prs-${{ matrix.branch }}.json
 
       - name: Upload PRs JSON
         uses: actions/upload-artifact@v4
         with:
-          name: prs-json
-          path: prs.json
-
-  update-changelog:
-    needs: gather-prs
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out the repository
-        uses: actions/checkout@v4
+          name: prs-json-${{ matrix.branch }}
+          path: prs-${{ matrix.branch }}.json
 
       - name: Get current date
         id: get-date
@@ -65,7 +86,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.YDBOT_TOKEN }}
         with:
-          pr_data: "${{ needs.gather-prs.outputs.prs }}"
-          changelog_path: "./CHANGELOG.md" # RODO: Use the correct path to your CHANGELOG.md file
-          base_branch: "${{ github.ref_name }}"
+          pr_data: ${{ steps.pr-list.outputs.prs }}
+          changelog_path: "./CHANGELOG.md" 
+          base_branch: "${{ matrix.branch }}"
           suffix: "${{ env.suffix }}"

Diff for: CHANGELOG.md

@@ -1,16 +1,16 @@
 ## Unreleased
 
 ### Functionality
-
 * 15186:Increased [the query text limit size](../dev/system-views#query-metrics) in system views from 4 KB to 10 KB. [#15186](https://github.com/ydb-platform/ydb/pull/15186) ([spuchin](https://github.com/spuchin))
-* 15693:Added a health check configuration that administrators can customize: the number of node restarts, tablets, the time difference between database dynodes,
-and timeout (by default, the maximum response time from healthcheck). Documentation is under construction. [#15693](https://github.com/ydb-platform/ydb/pull/15693) ([Andrei Rykov](https://github.com/StekPerepolnen))
+* None:15693:Added a health check configuration that administrators can customize: the number of node restarts, tablets, the time difference between database dynodes,
 
 ### Bug fixes
-
 * 15721:Fixed a bug in YDB UUID column handling in ReadTable SDK method. [#15721](https://github.com/ydb-platform/ydb/pull/15721) ([Ivan Nikolaev](https://github.com/lex007in))
 * 16061:Fixed a bug in handling OLAP scan queries with predicates. [#16061](https://github.com/ydb-platform/ydb/pull/16061) ([Semyon](https://github.com/swalrus1))
 * 16060:Fixed an [error](https://github.com/ydb-platform/ydb/issues/15551) that caused the **RETURNING** clause  work incorrectly with INSERT/UPSERT operations. [#16060](https://github.com/ydb-platform/ydb/pull/16060) ([Vitalii Gridnev](https://github.com/gridnevvvit))
-* 16021:Fixed a rare error that led to a VERIFY error when replicating data. #10650 [#16021](https://github.com/ydb-platform/ydb/pull/16021) ([Alexander Rutkovsky](https://github.com/alexvru))
+* 10650:21:Fixed a rare error that led to a VERIFY error when replicating data. #10650 [#16021](https://github.com/ydb-platform/ydb/pull/16021) ([Alexander Rutkovsky](https://github.com/alexvru))
 * 16016:Fixed rare node failures during read session balancing. https://github.com/ydb-platform/ydb/issues/16017 [#16016](https://github.com/ydb-platform/ydb/pull/16016) ([Nikolay Shestakov](https://github.com/nshestakov))
-* 16423:Changed behavior — `SHOW CREATE TABLE` now fails on views instead of producing wrong output. [#16423](https://github.com/ydb-platform/ydb/pull/16423) ([Daniil Demin](https://github.com/jepett0))
+* 16423:Changed behavior — `SHOW CREATE TABLE` now fails on views instead of producing wrong output. [#16423](https://github.com/ydb-platform/ydb/pull/16423) ([Daniil Demin](https://github.com/jepett0))
+* 16958:Fixed unauthorized error in `ydb admin database restore` when multiple database admins are in dump. https://github.com/ydb-platform/ydb/issues/16833 [#16958](https://github.com/ydb-platform/ydb/pull/16958) ([Ilia Shakhov](https://github.com/pixcc))
+* 16943:Fixed scheme error in `ydb admin cluster dump` when specifying a domain database. https://github.com/ydb-platform/ydb/issues/16262 [#16943](https://github.com/ydb-platform/ydb/pull/16943) ([Ilia Shakhov](https://github.com/pixcc))
+