test with main [skip ci]

DataDog · Jan 27, 2025 · ab63160 · ab63160
1 parent 17f915d
commit ab63160
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/create_rc_pr.yml b/.github/workflows/create_rc_pr.yml
@@ -16,6 +16,9 @@ permissions: {}
 jobs:
     find_release_branches:
         runs-on: ubuntu-latest
+        permissions:
+          contents: write
+          pull-requests: write
         outputs:
           branches: ${{ steps.branches.outputs.value }}
           warning: ${{ steps.warning.outputs.value }}
@@ -24,6 +27,7 @@ jobs:
               uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
               with:
                 ref: sabrina/pin-intg-core
+                fetch-depth: 0
                 persist-credentials: true
 
             - name: Install python
@@ -41,7 +45,9 @@ jobs:
 
             - name: test integrations Core
               run: |
-                inv release.pin-integrations-core
+                git status
+                git tag --merged sabrina/pin-intg-core | grep -E '^7\.[0-9]+\.[0-9]+(-rc.*|-devel.*)?$'
+                inv -e release.pin-integrations-core
     #         - name: Check previous agent 6 RC status
     #           if: ${{ env.IS_AGENT6_RELEASE == 'true' }}
     #           env:

diff --git a/tasks/libs/releasing/version.py b/tasks/libs/releasing/version.py
@@ -434,7 +434,7 @@ def get_matching_pattern(ctx, major_version, release=False):
     if release or os.getenv("BUCKET_BRANCH") in ALLOWED_REPO_NIGHTLY_BRANCHES:
         tags = (
             ctx.run(
-                rf"git tag --list --merged {get_current_branch(ctx)} | grep -E '^{major_version}\.[0-9]+\.[0-9]+(-rc.*|-devel.*)?$'",
+                rf"git tag --list --merged main | grep -E '^{major_version}\.[0-9]+\.[0-9]+(-rc.*|-devel.*)?$'",
                 hide=True,
             )
             .stdout.strip()