From a20c2b4927d3d7599a73615a87b158cdb8f78241 Mon Sep 17 00:00:00 2001 From: Ugaitz Urien Date: Fri, 9 Aug 2024 15:58:56 +0200 Subject: [PATCH 1/5] Add logs --- .github/workflows/prepare-release-proposal.yml | 9 +++++++-- scripts/prepare-release-proposal.js | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/prepare-release-proposal.yml b/.github/workflows/prepare-release-proposal.yml index 6712c49a73d..b2fc5382d3e 100644 --- a/.github/workflows/prepare-release-proposal.yml +++ b/.github/workflows/prepare-release-proposal.yml @@ -19,7 +19,6 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - ref: ${{ matrix.base-branch }} token: ${{ secrets.GH_ACCESS_TOKEN_RELEASE }} - name: Set up Git @@ -27,12 +26,18 @@ jobs: git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" + - name: Copy scripts + run: | + git pull + cp -r scripts _scripts + + - name: Pull master branch run: | git checkout master git pull - cp -r scripts _scripts git checkout ${{ matrix.base-branch }} + git pull - name: Configure node diff --git a/scripts/prepare-release-proposal.js b/scripts/prepare-release-proposal.js index fc26a2d738a..9f104ca8200 100644 --- a/scripts/prepare-release-proposal.js +++ b/scripts/prepare-release-proposal.js @@ -61,9 +61,13 @@ function commitBranchDiffs (args) { const commandCore = `branch-diff --user DataDog --repo test-node-release-rebase \ --exclude-label=${excludedLabels.join(',')}` - const releaseNotesDraft = execSync(`${commandCore} ${releaseBranch} master`).toString() + const releaseNotesCommand = `${commandCore} ${releaseBranch} master` + console.log('command for release notes', releaseNotesCommand) + const releaseNotesDraft = execSync(releaseNotesCommand).toString() - execSync(`${commandCore} --format=sha --reverse ${releaseBranch} master | xargs git cherry-pick`) + const cherryPickCommand = `${commandCore} --format=sha --reverse ${releaseBranch} master | xargs git cherry-pick` + console.log('command for cherry picks', cherryPickCommand) + execSync(cherryPickCommand) console.log(releaseNotesDraft) } From 84790cf41022f0415653c1d1ac666e7d885a9e66 Mon Sep 17 00:00:00 2001 From: Ugaitz Urien Date: Fri, 9 Aug 2024 16:25:27 +0200 Subject: [PATCH 2/5] Try with different access token in branch-diff --- .github/workflows/prepare-release-proposal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/prepare-release-proposal.yml b/.github/workflows/prepare-release-proposal.yml index b2fc5382d3e..5de517477b8 100644 --- a/.github/workflows/prepare-release-proposal.yml +++ b/.github/workflows/prepare-release-proposal.yml @@ -54,7 +54,7 @@ jobs: - name: Configure branch-diff run: | mkdir -p ~/.config/changelog-maker - echo "{\"token\":\"${{secrets.GITHUB_TOKEN}}\",\"user\":\"${{github.actor}}\"}" > ~/.config/changelog-maker/config.json + echo "{\"token\":\"${{secrets.GH_ACCESS_TOKEN_RELEASE}}\",\"user\":\"${{github.actor}}\"}" > ~/.config/changelog-maker/config.json - name: Commit branch diffs id: commit_branch_diffs From 6371c47ff78a5b8e54436a60997ecd6b893b495e Mon Sep 17 00:00:00 2001 From: Ugaitz Urien Date: Fri, 9 Aug 2024 16:27:21 +0200 Subject: [PATCH 3/5] Fix prepare-release-proposal.js --- .github/workflows/prepare-release-proposal.yml | 3 ++- scripts/prepare-release-proposal.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prepare-release-proposal.yml b/.github/workflows/prepare-release-proposal.yml index 5de517477b8..3a8e7b0ab83 100644 --- a/.github/workflows/prepare-release-proposal.yml +++ b/.github/workflows/prepare-release-proposal.yml @@ -46,6 +46,7 @@ jobs: - name: Install dependencies run: | yarn + git checkout yarn.lock - name: Install branch-diff run: | @@ -54,7 +55,7 @@ jobs: - name: Configure branch-diff run: | mkdir -p ~/.config/changelog-maker - echo "{\"token\":\"${{secrets.GH_ACCESS_TOKEN_RELEASE}}\",\"user\":\"${{github.actor}}\"}" > ~/.config/changelog-maker/config.json + echo "{\"token\":\"${{secrets.GITHUB_TOKEN}}\",\"user\":\"${{github.actor}}\"}" > ~/.config/changelog-maker/config.json - name: Commit branch diffs id: commit_branch_diffs diff --git a/scripts/prepare-release-proposal.js b/scripts/prepare-release-proposal.js index 9f104ca8200..47d84c44336 100644 --- a/scripts/prepare-release-proposal.js +++ b/scripts/prepare-release-proposal.js @@ -58,7 +58,7 @@ function commitBranchDiffs (args) { `dont-land-on-${releaseBranch}` ] - const commandCore = `branch-diff --user DataDog --repo test-node-release-rebase \ + const commandCore = `branch-diff --user DataDog --repo dd-trace-js \ --exclude-label=${excludedLabels.join(',')}` const releaseNotesCommand = `${commandCore} ${releaseBranch} master` From 5aa86c300273c6bf22db0baba0865fbe39e73c73 Mon Sep 17 00:00:00 2001 From: Ugaitz Urien Date: Fri, 9 Aug 2024 16:52:44 +0200 Subject: [PATCH 4/5] Undo unnecessary changes --- .github/workflows/prepare-release-proposal.yml | 9 ++------- scripts/prepare-release-proposal.js | 8 ++------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/prepare-release-proposal.yml b/.github/workflows/prepare-release-proposal.yml index 3a8e7b0ab83..46e472e4e33 100644 --- a/.github/workflows/prepare-release-proposal.yml +++ b/.github/workflows/prepare-release-proposal.yml @@ -19,6 +19,7 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + ref: ${{ matrix.base-branch }} token: ${{ secrets.GH_ACCESS_TOKEN_RELEASE }} - name: Set up Git @@ -26,18 +27,12 @@ jobs: git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" - - name: Copy scripts - run: | - git pull - cp -r scripts _scripts - - - name: Pull master branch run: | git checkout master git pull + cp -r scripts _scripts git checkout ${{ matrix.base-branch }} - git pull - name: Configure node diff --git a/scripts/prepare-release-proposal.js b/scripts/prepare-release-proposal.js index 47d84c44336..0d39941f580 100644 --- a/scripts/prepare-release-proposal.js +++ b/scripts/prepare-release-proposal.js @@ -61,13 +61,9 @@ function commitBranchDiffs (args) { const commandCore = `branch-diff --user DataDog --repo dd-trace-js \ --exclude-label=${excludedLabels.join(',')}` - const releaseNotesCommand = `${commandCore} ${releaseBranch} master` - console.log('command for release notes', releaseNotesCommand) - const releaseNotesDraft = execSync(releaseNotesCommand).toString() + const releaseNotesDraft = execSync(`${commandCore} ${releaseBranch} master`).toString() - const cherryPickCommand = `${commandCore} --format=sha --reverse ${releaseBranch} master | xargs git cherry-pick` - console.log('command for cherry picks', cherryPickCommand) - execSync(cherryPickCommand) + execSync(`${commandCore} --format=sha --reverse ${releaseBranch} master | xargs git cherry-pick`) console.log(releaseNotesDraft) } From ad58a938b25269b432e875082b2ac48dc8e4e892 Mon Sep 17 00:00:00 2001 From: Ugaitz Urien Date: Fri, 9 Aug 2024 16:53:40 +0200 Subject: [PATCH 5/5] oneline --- scripts/prepare-release-proposal.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/prepare-release-proposal.js b/scripts/prepare-release-proposal.js index 0d39941f580..507ac3d4708 100644 --- a/scripts/prepare-release-proposal.js +++ b/scripts/prepare-release-proposal.js @@ -58,8 +58,7 @@ function commitBranchDiffs (args) { `dont-land-on-${releaseBranch}` ] - const commandCore = `branch-diff --user DataDog --repo dd-trace-js \ ---exclude-label=${excludedLabels.join(',')}` + const commandCore = `branch-diff --user DataDog --repo dd-trace-js --exclude-label=${excludedLabels.join(',')}` const releaseNotesDraft = execSync(`${commandCore} ${releaseBranch} master`).toString()