From c396e3e3d7c41d3caab74e03e6191dc5a630b526 Mon Sep 17 00:00:00 2001 From: Daine Trinidad Date: Thu, 15 Feb 2024 08:49:58 -0800 Subject: [PATCH 1/9] ci: workflow fixes --- .github/workflows/release-generator.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-generator.yml b/.github/workflows/release-generator.yml index 5170265c1..3108f970a 100644 --- a/.github/workflows/release-generator.yml +++ b/.github/workflows/release-generator.yml @@ -1,6 +1,9 @@ name: Release Generator on: workflow_dispatch: + pull_request: + branches: + - main push: branches: - main @@ -21,7 +24,7 @@ jobs: - uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e # v4.0.2 with: - command: manifest token: ${{ steps.sre_app_token.outputs.token }} release-type: node - default-branch: main + skip-github-release: true + skip-github-pull-request: true From d8d51a4b1bcd12681244f899c41fd012c775fe5b Mon Sep 17 00:00:00 2001 From: Daine Trinidad Date: Thu, 15 Feb 2024 09:14:56 -0800 Subject: [PATCH 2/9] Update release-generator.yml --- .github/workflows/release-generator.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-generator.yml b/.github/workflows/release-generator.yml index 3108f970a..24098ce85 100644 --- a/.github/workflows/release-generator.yml +++ b/.github/workflows/release-generator.yml @@ -19,12 +19,12 @@ jobs: - uses: actions/create-github-app-token@86576b355dd19da0519e0bdb63d8edb5bcf76a25 # v1.7.0 id: sre_app_token with: - app_id: ${{ secrets.SRE_APP_ID }} - private_key: ${{ secrets.SRE_APP_PRIVATE_KEY }} + app-id: ${{ secrets.SRE_APP_ID }} + private-key: ${{ secrets.SRE_APP_PRIVATE_KEY }} - uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e # v4.0.2 + id: release with: token: ${{ steps.sre_app_token.outputs.token }} release-type: node skip-github-release: true - skip-github-pull-request: true From c502725ecae89adf58f060f6d6b58b475e51e454 Mon Sep 17 00:00:00 2001 From: Daine Trinidad Date: Thu, 15 Feb 2024 09:25:17 -0800 Subject: [PATCH 3/9] chore: change include component in tag --- .github/workflows/release-generator.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-generator.yml b/.github/workflows/release-generator.yml index 24098ce85..c5e22a488 100644 --- a/.github/workflows/release-generator.yml +++ b/.github/workflows/release-generator.yml @@ -27,4 +27,4 @@ jobs: with: token: ${{ steps.sre_app_token.outputs.token }} release-type: node - skip-github-release: true + include-component-in-tag: true From 7dcd88dba52dc5a142e7f42a7bf257ed11395390 Mon Sep 17 00:00:00 2001 From: Daine Trinidad Date: Thu, 15 Feb 2024 09:38:28 -0800 Subject: [PATCH 4/9] chore: remove include-component-in-tag as it produces the wrong version --- .github/workflows/release-generator.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release-generator.yml b/.github/workflows/release-generator.yml index c5e22a488..b19fba5f8 100644 --- a/.github/workflows/release-generator.yml +++ b/.github/workflows/release-generator.yml @@ -27,4 +27,3 @@ jobs: with: token: ${{ steps.sre_app_token.outputs.token }} release-type: node - include-component-in-tag: true From 4a4c2541f94ed82507fc145ffd8ab8ca2520799b Mon Sep 17 00:00:00 2001 From: Daine Trinidad Date: Thu, 15 Feb 2024 09:48:07 -0800 Subject: [PATCH 5/9] chore: test new config --- .github/workflows/release-generator.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-generator.yml b/.github/workflows/release-generator.yml index b19fba5f8..694cf35bd 100644 --- a/.github/workflows/release-generator.yml +++ b/.github/workflows/release-generator.yml @@ -26,4 +26,4 @@ jobs: id: release with: token: ${{ steps.sre_app_token.outputs.token }} - release-type: node + skip-github-release: true From 38a8751b4153f62131b252f97db774005ce512fa Mon Sep 17 00:00:00 2001 From: Daine Trinidad Date: Thu, 15 Feb 2024 10:52:08 -0800 Subject: [PATCH 6/9] chore: update peer deps setting --- release-please-config.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/release-please-config.json b/release-please-config.json index 323cf75e0..c2b7e74b7 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -39,6 +39,10 @@ ], "release-type": "node", "plugins": [ + { + "type": "node-workspace", + "updatePeerDependencies": true + }, { "type": "linked-versions", "groupName": "GCDS Components", From be292909244e31b975c808c210cd0b6ff7727fba Mon Sep 17 00:00:00 2001 From: Daine Trinidad Date: Thu, 15 Feb 2024 10:56:00 -0800 Subject: [PATCH 7/9] chore: target this branch config --- .github/workflows/release-generator.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-generator.yml b/.github/workflows/release-generator.yml index 694cf35bd..308e269ca 100644 --- a/.github/workflows/release-generator.yml +++ b/.github/workflows/release-generator.yml @@ -27,3 +27,4 @@ jobs: with: token: ${{ steps.sre_app_token.outputs.token }} skip-github-release: true + target-branch: ci/gh-workflow-fix From ccce136c6dfbf050257c982c004e89e49f5f67ac Mon Sep 17 00:00:00 2001 From: Daine Trinidad Date: Thu, 15 Feb 2024 11:11:04 -0800 Subject: [PATCH 8/9] chore: prep for production --- .github/workflows/release-generator.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/release-generator.yml b/.github/workflows/release-generator.yml index 308e269ca..6e0f960dc 100644 --- a/.github/workflows/release-generator.yml +++ b/.github/workflows/release-generator.yml @@ -1,9 +1,6 @@ name: Release Generator on: workflow_dispatch: - pull_request: - branches: - - main push: branches: - main @@ -26,5 +23,4 @@ jobs: id: release with: token: ${{ steps.sre_app_token.outputs.token }} - skip-github-release: true target-branch: ci/gh-workflow-fix From 6c69ae91be9f42a265ae482f9712585122b05a15 Mon Sep 17 00:00:00 2001 From: Daine Trinidad Date: Thu, 15 Feb 2024 11:34:10 -0800 Subject: [PATCH 9/9] chore: prep for prod --- .github/workflows/release-generator.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release-generator.yml b/.github/workflows/release-generator.yml index 6e0f960dc..e51b01ce1 100644 --- a/.github/workflows/release-generator.yml +++ b/.github/workflows/release-generator.yml @@ -23,4 +23,3 @@ jobs: id: release with: token: ${{ steps.sre_app_token.outputs.token }} - target-branch: ci/gh-workflow-fix