fix tests and update post rebase

DataDog · Feb 12, 2025 · 76d7956 · 76d7956
1 parent 5ea6a0f
commit 76d7956
Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/create_rc_pr.yml b/.github/workflows/create_rc_pr.yml
@@ -119,7 +119,6 @@ jobs:
               env:
                 MATRIX: ${{ matrix.value }}
               run: |
-                git fetch
                 if ${{ env.IS_AGENT6_RELEASE == 'true' }}; then
                   inv -e release.create-rc -r "$MATRIX" --slack-webhook=${{ secrets.AGENT6_RELEASE_SLACK_WEBHOOK }} --patch-version
                 else

diff --git a/tasks/libs/common/utils.py b/tasks/libs/common/utils.py
@@ -506,8 +506,8 @@ def set_gitconfig_in_ci(ctx):
     Set username and email when runing git "write" commands in CI
     """
     if running_in_ci():
-        set_git_config('user.name', 'github-actions[bot]')
-        set_git_config('user.email', 'github-actions[bot]@users.noreply.github.com')
+        set_git_config(ctx, 'user.name', 'github-actions[bot]')
+        set_git_config(ctx, 'user.email', 'github-actions[bot]@users.noreply.github.com')
 
 
 @contextmanager

diff --git a/tasks/release.py b/tasks/release.py
@@ -36,7 +36,6 @@
     get_last_commit,
     get_last_release_tag,
     is_agent6,
-    set_git_config,
     try_git_command,
 )
 from tasks.libs.common.gomodules import get_default_modules
@@ -1350,14 +1349,7 @@ def bump_integrations_core(ctx, slack_webhook=None):
     """
     Create a PR to bump the integrations core fields in the release.json file
     """
-    github_workflow_url = ""
-    if os.environ.get("GITHUB_ACTIONS"):
-        set_git_config('user.name', 'github-actions[bot]')
-        set_git_config('user.email', 'github-actions[bot]@users.noreply.github.com')
-        github_server_url = os.environ.get("GITHUB_SERVER_URL")
-        github_run_id = os.environ.get("GITHUB_RUN_ID")
-        github_workflow_url = f"{github_server_url}/{GITHUB_REPO_NAME}/actions/runs/{github_run_id}"
-
+    github_workflow_url = f"{os.environ.get('GITHUB_SERVER_URL', 'github.com')}/{GITHUB_REPO_NAME}/actions/runs/{os.environ.get('GITHUB_RUN_ID', '1')}"
     commit_hash = get_git_references(ctx, "integrations-core", "HEAD").split()[0]
 
     rj = load_release_json()
@@ -1373,6 +1365,7 @@ def bump_integrations_core(ctx, slack_webhook=None):
     ctx.run("git add release.json")
 
     commit_message = "bump integrations core to HEAD"
+    set_gitconfig_in_ci(ctx)
     ok = try_git_command(ctx, f"git commit -m '{commit_message}'")
     if not ok:
         raise Exit(