From aa89a5dd9a5af8e315545efde8dc0a112f319f6a Mon Sep 17 00:00:00 2001 From: rory Date: Mon, 11 Dec 2023 10:15:06 -0800 Subject: [PATCH 1/4] Use vanilla setupGitForOSBotify action in createNewVersion.yml --- .github/workflows/createNewVersion.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml index 5f7f95e102e3..e914a88b82c5 100644 --- a/.github/workflows/createNewVersion.yml +++ b/.github/workflows/createNewVersion.yml @@ -76,12 +76,10 @@ jobs: token: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }} - name: Setup git for OSBotify - uses: ./.github/actions/composite/setupGitForOSBotifyApp + uses: ./.github/actions/composite/setupGitForOSBotify id: setupGitForOSBotify with: GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }} - OS_BOTIFY_APP_ID: ${{ secrets.OS_BOTIFY_APP_ID }} - OS_BOTIFY_PRIVATE_KEY: ${{ secrets.OS_BOTIFY_PRIVATE_KEY }} - name: Generate version id: bumpVersion From e03f2bb4114b8100468b429665f1ffaf6121a3ae Mon Sep 17 00:00:00 2001 From: rory Date: Mon, 11 Dec 2023 11:32:32 -0800 Subject: [PATCH 2/4] Use commit token, remove unused secrets --- .github/workflows/createNewVersion.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml index e914a88b82c5..f772bfb818f0 100644 --- a/.github/workflows/createNewVersion.yml +++ b/.github/workflows/createNewVersion.yml @@ -32,12 +32,6 @@ on: OS_BOTIFY_COMMIT_TOKEN: description: OSBotify personal access token, used to workaround committing to protected branch required: true - OS_BOTIFY_APP_ID: - description: Application ID for OS Botify App - required: true - OS_BOTIFY_PRIVATE_KEY: - description: OSBotify private key - required: true jobs: validateActor: @@ -85,7 +79,7 @@ jobs: id: bumpVersion uses: ./.github/actions/javascript/bumpVersion with: - GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }} + GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }} SEMVER_LEVEL: ${{ inputs.SEMVER_LEVEL }} - name: Commit new version From 09c54b653490f03aaf43d9f80bde3a113a1a1e51 Mon Sep 17 00:00:00 2001 From: rory Date: Mon, 11 Dec 2023 13:00:03 -0800 Subject: [PATCH 3/4] Fix createNewVersion.test.js (hopefully) --- .../assertions/createNewVersionAssertions.js | 16 ++-------------- workflow_tests/mocks/createNewVersionMocks.js | 3 +-- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/workflow_tests/assertions/createNewVersionAssertions.js b/workflow_tests/assertions/createNewVersionAssertions.js index 27c54e924975..458d883fd8c3 100644 --- a/workflow_tests/assertions/createNewVersionAssertions.js +++ b/workflow_tests/assertions/createNewVersionAssertions.js @@ -26,19 +26,7 @@ const assertCreateNewVersionJobExecuted = (workflowResult, semverLevel = 'BUILD' ], [], ), - utils.createStepAssertion( - 'Setup git for OSBotify', - true, - null, - 'CREATENEWVERSION', - 'Setup git for OSBotify', - [ - {key: 'GPG_PASSPHRASE', value: '***'}, - {key: 'OS_BOTIFY_APP_ID', value: '***'}, - {key: 'OS_BOTIFY_PRIVATE_KEY', value: '***'}, - ], - [], - ), + utils.createStepAssertion('Setup git for OSBotify', true, null, 'CREATENEWVERSION', 'Setup git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}], []), utils.createStepAssertion( 'Generate version', true, @@ -46,7 +34,7 @@ const assertCreateNewVersionJobExecuted = (workflowResult, semverLevel = 'BUILD' 'CREATENEWVERSION', 'Generate version', [ - {key: 'GITHUB_TOKEN', value: 'os_botify_api_token'}, + {key: 'GITHUB_TOKEN', value: 'os_botify_token'}, {key: 'SEMVER_LEVEL', value: semverLevel}, ], [], diff --git a/workflow_tests/mocks/createNewVersionMocks.js b/workflow_tests/mocks/createNewVersionMocks.js index 5e82e2102ef0..a1f601aef47f 100644 --- a/workflow_tests/mocks/createNewVersionMocks.js +++ b/workflow_tests/mocks/createNewVersionMocks.js @@ -21,9 +21,8 @@ const CREATENEWVERSION__CREATENEWVERSION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = ut 'Setup git for OSBotify', 'Setup git for OSBotify', 'CREATENEWVERSION', - ['GPG_PASSPHRASE', 'OS_BOTIFY_APP_ID', 'OS_BOTIFY_PRIVATE_KEY'], + ['GPG_PASSPHRASE'], [], - {OS_BOTIFY_API_TOKEN: 'os_botify_api_token'}, ); const CREATENEWVERSION__CREATENEWVERSION__GENERATE_VERSION__STEP_MOCK = utils.createMockStep( 'Generate version', From 3bd01fbacff1b411ca45ab77ab4eb49dad2df5d3 Mon Sep 17 00:00:00 2001 From: rory Date: Tue, 12 Dec 2023 13:34:39 -0800 Subject: [PATCH 4/4] Try again to fix workflow_tests --- workflow_tests/assertions/createNewVersionAssertions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow_tests/assertions/createNewVersionAssertions.js b/workflow_tests/assertions/createNewVersionAssertions.js index 458d883fd8c3..e4526ae59be2 100644 --- a/workflow_tests/assertions/createNewVersionAssertions.js +++ b/workflow_tests/assertions/createNewVersionAssertions.js @@ -34,7 +34,7 @@ const assertCreateNewVersionJobExecuted = (workflowResult, semverLevel = 'BUILD' 'CREATENEWVERSION', 'Generate version', [ - {key: 'GITHUB_TOKEN', value: 'os_botify_token'}, + {key: 'GITHUB_TOKEN', value: '***'}, {key: 'SEMVER_LEVEL', value: semverLevel}, ], [],