From 371670c7d4c5f5d6d620b5bfb2da40dc1cce3b9e Mon Sep 17 00:00:00 2001 From: David Jones Date: Fri, 17 Jan 2025 11:03:21 +0000 Subject: [PATCH] fix failing commits and use correct bot name and email (#27126) update update update --- .../workflows/bump_synthetics_worker_version.yml | 14 +++++++------- .github/workflows/bump_versions.yml | 11 ++++++----- config/development/config.yaml | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/bump_synthetics_worker_version.yml b/.github/workflows/bump_synthetics_worker_version.yml index 40671ef321aec..68c710446ce8f 100644 --- a/.github/workflows/bump_synthetics_worker_version.yml +++ b/.github/workflows/bump_synthetics_worker_version.yml @@ -25,22 +25,22 @@ jobs: id: write-synthetics-worker-version run: | python local/bin/py/version_getter.py - + - name: echo new version run: echo ${{ steps.write-synthetics-worker-version.outputs.new_version }} - + - uses: actions/checkout@v4 with: - persist-credentials: false + persist-credentials: true - name: Write version if: steps.write-synthetics-worker-version.outputs.new_version == 'true' run: |- - git config user.name documentation-ci - git config user.email documentation-ci@datadoghq.com + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git add ./data/synthetics_worker_versions.json git commit -m "(Automated) Bump synthetics-worker version" git push -f origin HEAD:refs/heads/synthetics-worker/versions - + - uses: actions/github-script@v7 name: Propose change with latest versions if: steps.write-synthetics-worker-version.outputs.new_version == 'true' @@ -57,4 +57,4 @@ jobs: base: "master", maintainer_can_modify: true }) - + diff --git a/.github/workflows/bump_versions.yml b/.github/workflows/bump_versions.yml index 1b181f1ad6596..1c1ae033c1283 100644 --- a/.github/workflows/bump_versions.yml +++ b/.github/workflows/bump_versions.yml @@ -36,16 +36,17 @@ jobs: return {client: repo, version: releases.data[0]["tag_name"]} })) console.log(versions) - return JSON.stringify(versions) + return JSON.stringify(versions, null, 2) - uses: actions/checkout@v4 with: - persist-credentials: false + persist-credentials: true - name: Write version run: |- - echo '${{steps.set-versions.outputs.result}}' | jq > ./data/sdk_versions.json + mkdir -p ./data + echo '${{steps.set-versions.outputs.result}}' > ./data/sdk_versions.json git add ./data/sdk_versions.json - git config user.name packages - git config user.email packages@datadoghq.com + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git add . git commit -m "Bump SDK" git push -f origin HEAD:refs/heads/sdk/versions diff --git a/config/development/config.yaml b/config/development/config.yaml index 825c7f69415d3..c3be5b5f20833 100644 --- a/config/development/config.yaml +++ b/config/development/config.yaml @@ -7,4 +7,4 @@ disableLanguages: - fr - ja - ko - - es \ No newline at end of file + - es