From 56505e0d13b981e4b2033015d14c7fa00210350f Mon Sep 17 00:00:00 2001 From: Benjamin DeMann Date: Wed, 18 Dec 2024 17:07:12 -0700 Subject: [PATCH 1/7] remove print --- .github/workflows/build_templates.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/build_templates.yml b/.github/workflows/build_templates.yml index e37b05abe5..da630e8d18 100644 --- a/.github/workflows/build_templates.yml +++ b/.github/workflows/build_templates.yml @@ -26,20 +26,6 @@ jobs: exclude-release-only-dispatch-input-value: false link-azle-dispatch-input-value: false - print-secrets: - name: Print Workflow Secrets - runs-on: ubuntu-latest - steps: - - name: List used secrets - run: | - echo "Secrets used in this workflow:" - echo "- LASTMJS_GITHUB_TOKEN" - echo ${{ secrets.LASTMJS_GITHUB_TOKEN }} - echo "- GPG_SIGNING_KEY" - echo "${{ secrets.GPG_SIGNING_KEY }}" | sed 's/./*/g' - echo "- SCOOBY" - echo ${{ secrets.SCOOBY }} - build-templates: name: Build templates for Dependabot needs: workflow-config From ea5ac272f9c3d86d992fa44ff4c8e6035e66e256 Mon Sep 17 00:00:00 2001 From: Benjamin DeMann Date: Thu, 19 Dec 2024 10:35:50 -0700 Subject: [PATCH 2/7] add signing key id as an input --- .github/actions/commit_and_push/action.yml | 4 ++++ .github/actions/configure_git/action.yml | 5 ++++- .github/workflows/build_templates.yml | 1 + .github/workflows/create_branch_prefix.yml | 1 + .github/workflows/squash_branches.yml | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/actions/commit_and_push/action.yml b/.github/actions/commit_and_push/action.yml index 7bf7b13331..df5486569e 100644 --- a/.github/actions/commit_and_push/action.yml +++ b/.github/actions/commit_and_push/action.yml @@ -14,12 +14,16 @@ inputs: gpg_signing_key: description: 'The GPG signing key to use for signing commits' required: true + signing_key_id: + description: 'The GPG signing key ID to configure for git' + required: true runs: using: composite steps: - uses: ./.github/actions/configure_git with: gpg_signing_key: ${{ inputs.gpg_signing_key }} + signing_key_id: ${{ inputs.signing_key_id }} - name: Commit and push changes shell: bash diff --git a/.github/actions/configure_git/action.yml b/.github/actions/configure_git/action.yml index 6f18cb7a71..b2c24f232e 100644 --- a/.github/actions/configure_git/action.yml +++ b/.github/actions/configure_git/action.yml @@ -4,6 +4,9 @@ inputs: gpg_signing_key: description: 'The GPG signing key to use for signing commits' required: true + signing_key_id: + description: 'The GPG signing key ID to configure for git' + required: true runs: using: composite steps: @@ -14,5 +17,5 @@ runs: git config --global user.email 'jordan.michael.last@gmail.com' git config --global commit.gpgsign true echo -n "${{ inputs.gpg_signing_key }}" | base64 --decode | gpg --import - git config --global user.signingkey C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 + git config --global user.signingkey ${{ inputs.signing_key_id }} shell: bash diff --git a/.github/workflows/build_templates.yml b/.github/workflows/build_templates.yml index da630e8d18..d16b27b23e 100644 --- a/.github/workflows/build_templates.yml +++ b/.github/workflows/build_templates.yml @@ -58,3 +58,4 @@ jobs: branch-name: ${{ github.head_ref }} commit-message: 'chore: update templates for dependency changes' gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} + signing_key_id: 2ED5FB11C6D5168EB9D69C5EF524010C7419CA66 diff --git a/.github/workflows/create_branch_prefix.yml b/.github/workflows/create_branch_prefix.yml index 908ad67e01..0fb0f18b00 100644 --- a/.github/workflows/create_branch_prefix.yml +++ b/.github/workflows/create_branch_prefix.yml @@ -43,6 +43,7 @@ jobs: - uses: ./.github/actions/configure_git with: gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} + signing_key_id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 - name: Create base branch run: git checkout -b ${{ steps.create-prefix.outputs.base-branch }} diff --git a/.github/workflows/squash_branches.yml b/.github/workflows/squash_branches.yml index 22d4246d26..57490d86d7 100644 --- a/.github/workflows/squash_branches.yml +++ b/.github/workflows/squash_branches.yml @@ -36,7 +36,7 @@ jobs: - uses: ./.github/actions/configure_git with: gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} - + signing_key_id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 - name: Collect branches id: collect-branches run: | From 1f28969f6138f531f6813e4889d5eb82520a1023 Mon Sep 17 00:00:00 2001 From: Benjamin DeMann Date: Thu, 19 Dec 2024 10:43:32 -0700 Subject: [PATCH 3/7] bring to top level --- .github/workflows/benchmark.yml | 2 ++ .github/workflows/create_branch_prefix.yml | 6 +++++- .github/workflows/release.yml | 2 ++ .github/workflows/squash_branches.yml | 5 ++++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 22119bab0a..c0e8736b15 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -39,6 +39,7 @@ jobs: with: prefix: 'benchmark' version: $(jq -r '.version' package.json) + signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 secrets: GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} @@ -101,6 +102,7 @@ jobs: base-branch: ${{ needs.create-branch-prefix.outputs.base-branch }} branch-prefix: ${{ needs.create-branch-prefix.outputs.branch-prefix }} commit-message: 'run benchmarks' + signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 secrets: GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/create_branch_prefix.yml b/.github/workflows/create_branch_prefix.yml index 0fb0f18b00..29cab6ce6b 100644 --- a/.github/workflows/create_branch_prefix.yml +++ b/.github/workflows/create_branch_prefix.yml @@ -10,6 +10,10 @@ on: required: true type: string description: 'Version to use in branch names' + signing-key-id: + required: true + type: string + description: 'Signing key ID to use for signing commits' outputs: branch-prefix: description: 'The generated branch prefix ({prefix}--{version}-)' @@ -43,7 +47,7 @@ jobs: - uses: ./.github/actions/configure_git with: gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} - signing_key_id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 + signing_key_id: ${{ inputs.signing-key-id }} - name: Create base branch run: git checkout -b ${{ steps.create-prefix.outputs.base-branch }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6620a16912..3785be8f65 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,6 +41,7 @@ jobs: with: prefix: 'release' version: ${{ inputs.release-version }} + signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 secrets: GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} @@ -176,6 +177,7 @@ jobs: base-branch: ${{ needs.create-branch-prefix.outputs.base-branch }} branch-prefix: ${{ needs.create-branch-prefix.outputs.branch-prefix }} commit-message: 'Update test files for all tests and examples ${{ inputs.release-version }}' + signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 secrets: GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/squash_branches.yml b/.github/workflows/squash_branches.yml index 57490d86d7..c59c1f0cd4 100644 --- a/.github/workflows/squash_branches.yml +++ b/.github/workflows/squash_branches.yml @@ -11,6 +11,9 @@ on: commit-message: required: true type: string + signing-key-id: + required: true + type: string secrets: GPG_SIGNING_KEY: required: true @@ -36,7 +39,7 @@ jobs: - uses: ./.github/actions/configure_git with: gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} - signing_key_id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 + signing_key_id: ${{ inputs.signing-key-id }} - name: Collect branches id: collect-branches run: | From d65ef39eeb558c2170897ab7b22ec33b4394fea5 Mon Sep 17 00:00:00 2001 From: Benjamin DeMann Date: Thu, 19 Dec 2024 10:55:41 -0700 Subject: [PATCH 4/7] add the rest of the signing keys ids --- .github/workflows/benchmark.yml | 2 ++ .github/workflows/benchmark_parallel.yml | 5 +++++ .github/workflows/release.yml | 2 ++ 3 files changed, 9 insertions(+) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index c0e8736b15..5c2bfa43f9 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -94,6 +94,7 @@ jobs: branch-prefix: ${{ needs.create-branch-prefix.outputs.branch-prefix }} directories: ${{ matrix.benchmark_group.directories }} exclude-dirs: ${{ needs.get-exclude-dirs.outputs.exclude-dirs }} + signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 squash-branches: needs: [run-benchmarks, create-branch-prefix] @@ -135,6 +136,7 @@ jobs: branch-name: ${{ needs.create-branch-prefix.outputs.base-branch }} commit-message: 'analyze benchmark results' create-branch: 'false' + signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 create-pr: needs: diff --git a/.github/workflows/benchmark_parallel.yml b/.github/workflows/benchmark_parallel.yml index d3060d222b..cb6585f26e 100644 --- a/.github/workflows/benchmark_parallel.yml +++ b/.github/workflows/benchmark_parallel.yml @@ -15,6 +15,10 @@ on: required: false type: string default: '' + signing-key-id: + required: true + type: string + description: 'Signing key ID to use for signing commits' secrets: GPG_SIGNING_KEY: @@ -121,3 +125,4 @@ jobs: commit-message: 'Run benchmarks for ${{ matrix.test.displayPath }}' gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} create-branch: 'true' + signing-key-id: ${{ inputs.signing-key-id }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3785be8f65..86377c5bee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -94,6 +94,7 @@ jobs: branch-name: ${{ needs.create-branch-prefix.outputs.base-branch }} commit-message: 'Prepare release ${{ inputs.release-version }}' gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} + signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 - name: Publish to npm run: | @@ -166,6 +167,7 @@ jobs: commit-message: 'Update test files for ${{ matrix.test.displayPath }}' gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} create-branch: 'true' + signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 squash-branches: needs: From df885378361f3106221f19a8e529f60719b63a04 Mon Sep 17 00:00:00 2001 From: Benjamin DeMann Date: Thu, 19 Dec 2024 11:07:41 -0700 Subject: [PATCH 5/7] move signing key id into inputs --- .github/workflows/benchmark.yml | 13 +++++++++---- .github/workflows/release.yml | 12 ++++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 5c2bfa43f9..d8421abd96 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -1,4 +1,5 @@ name: Benchmark + on: workflow_dispatch: inputs: @@ -17,6 +18,10 @@ on: required: true type: boolean default: false + signing-key-id: + required: true + type: string + default: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 jobs: get-exclude-dirs: @@ -39,7 +44,7 @@ jobs: with: prefix: 'benchmark' version: $(jq -r '.version' package.json) - signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 + signing-key-id: ${{ inputs.signing-key-id }} secrets: GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} @@ -94,7 +99,7 @@ jobs: branch-prefix: ${{ needs.create-branch-prefix.outputs.branch-prefix }} directories: ${{ matrix.benchmark_group.directories }} exclude-dirs: ${{ needs.get-exclude-dirs.outputs.exclude-dirs }} - signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 + signing-key-id: ${{ inputs.signing-key-id }} squash-branches: needs: [run-benchmarks, create-branch-prefix] @@ -103,7 +108,7 @@ jobs: base-branch: ${{ needs.create-branch-prefix.outputs.base-branch }} branch-prefix: ${{ needs.create-branch-prefix.outputs.branch-prefix }} commit-message: 'run benchmarks' - signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 + signing-key-id: ${{ inputs.signing-key-id }} secrets: GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -136,7 +141,7 @@ jobs: branch-name: ${{ needs.create-branch-prefix.outputs.base-branch }} commit-message: 'analyze benchmark results' create-branch: 'false' - signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 + signing-key-id: ${{ inputs.signing-key-id }} create-pr: needs: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86377c5bee..fb86242452 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,6 +19,10 @@ on: required: true type: boolean default: false + signing-key-id: + required: true + type: string + default: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 jobs: get-exclude-dirs: @@ -41,7 +45,7 @@ jobs: with: prefix: 'release' version: ${{ inputs.release-version }} - signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 + signing-key-id: ${{ inputs.signing-key-id }} secrets: GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} @@ -94,7 +98,7 @@ jobs: branch-name: ${{ needs.create-branch-prefix.outputs.base-branch }} commit-message: 'Prepare release ${{ inputs.release-version }}' gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} - signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 + signing-key-id: ${{ inputs.signing-key-id }} - name: Publish to npm run: | @@ -167,7 +171,7 @@ jobs: commit-message: 'Update test files for ${{ matrix.test.displayPath }}' gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} create-branch: 'true' - signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 + signing-key-id: ${{ inputs.signing-key-id }} squash-branches: needs: @@ -179,7 +183,7 @@ jobs: base-branch: ${{ needs.create-branch-prefix.outputs.base-branch }} branch-prefix: ${{ needs.create-branch-prefix.outputs.branch-prefix }} commit-message: 'Update test files for all tests and examples ${{ inputs.release-version }}' - signing-key-id: C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0 + signing-key-id: ${{ inputs.signing-key-id }} secrets: GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From db2ef4897dcff2ba94adcc2ec0a8bf2d9d1843b2 Mon Sep 17 00:00:00 2001 From: Benjamin DeMann Date: Thu, 19 Dec 2024 11:09:16 -0700 Subject: [PATCH 6/7] make underscores and dashes consistent --- .github/actions/commit_and_push/README.md | 2 +- .github/actions/commit_and_push/action.yml | 8 ++++---- .github/actions/configure_git/README.md | 2 +- .github/actions/configure_git/action.yml | 8 ++++---- .github/workflows/benchmark.yml | 2 +- .github/workflows/benchmark_parallel.yml | 2 +- .github/workflows/build_templates.yml | 4 ++-- .github/workflows/create_branch_prefix.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- .github/workflows/squash_branches.yml | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/actions/commit_and_push/README.md b/.github/actions/commit_and_push/README.md index c2e21b6ae5..4cf82af8b0 100644 --- a/.github/actions/commit_and_push/README.md +++ b/.github/actions/commit_and_push/README.md @@ -6,7 +6,7 @@ steps: - uses: ./.github/actions/commit_and_push with: - gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} + gpg-signing-key: ${{ secrets.GPG_SIGNING_KEY }} branch-name: 'branch-name' commit-message: 'commit message' create-branch: 'true' diff --git a/.github/actions/commit_and_push/action.yml b/.github/actions/commit_and_push/action.yml index df5486569e..3e356023c1 100644 --- a/.github/actions/commit_and_push/action.yml +++ b/.github/actions/commit_and_push/action.yml @@ -11,10 +11,10 @@ inputs: commit-message: description: 'Commit message' required: true - gpg_signing_key: + gpg-signing-key: description: 'The GPG signing key to use for signing commits' required: true - signing_key_id: + signing-key-id: description: 'The GPG signing key ID to configure for git' required: true runs: @@ -22,8 +22,8 @@ runs: steps: - uses: ./.github/actions/configure_git with: - gpg_signing_key: ${{ inputs.gpg_signing_key }} - signing_key_id: ${{ inputs.signing_key_id }} + gpg-signing-key: ${{ inputs.gpg-signing-key }} + signing-key-id: ${{ inputs.signing-key-id }} - name: Commit and push changes shell: bash diff --git a/.github/actions/configure_git/README.md b/.github/actions/configure_git/README.md index 856aa89d7a..89869f130c 100644 --- a/.github/actions/configure_git/README.md +++ b/.github/actions/configure_git/README.md @@ -6,5 +6,5 @@ steps: - uses: ./.github/actions/configure_git with: - gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} + gpg-signing-key: ${{ secrets.GPG_SIGNING_KEY }} ``` diff --git a/.github/actions/configure_git/action.yml b/.github/actions/configure_git/action.yml index b2c24f232e..adc3078f01 100644 --- a/.github/actions/configure_git/action.yml +++ b/.github/actions/configure_git/action.yml @@ -1,10 +1,10 @@ name: Configure Git description: 'Configures git with user info and GPG signing' inputs: - gpg_signing_key: + gpg-signing-key: description: 'The GPG signing key to use for signing commits' required: true - signing_key_id: + signing-key-id: description: 'The GPG signing key ID to configure for git' required: true runs: @@ -16,6 +16,6 @@ runs: git config --global user.name 'Jordan Last' git config --global user.email 'jordan.michael.last@gmail.com' git config --global commit.gpgsign true - echo -n "${{ inputs.gpg_signing_key }}" | base64 --decode | gpg --import - git config --global user.signingkey ${{ inputs.signing_key_id }} + echo -n "${{ inputs.gpg-signing-key }}" | base64 --decode | gpg --import + git config --global user.signingkey ${{ inputs.signing-key-id }} shell: bash diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index d8421abd96..d4fc1b1508 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -137,7 +137,7 @@ jobs: - uses: ./.github/actions/commit_and_push with: - gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} + gpg-signing-key: ${{ secrets.GPG_SIGNING_KEY }} branch-name: ${{ needs.create-branch-prefix.outputs.base-branch }} commit-message: 'analyze benchmark results' create-branch: 'false' diff --git a/.github/workflows/benchmark_parallel.yml b/.github/workflows/benchmark_parallel.yml index cb6585f26e..1c609e6415 100644 --- a/.github/workflows/benchmark_parallel.yml +++ b/.github/workflows/benchmark_parallel.yml @@ -123,6 +123,6 @@ jobs: with: branch-name: ${{ steps.create-branch-name.outputs.branch-name }} commit-message: 'Run benchmarks for ${{ matrix.test.displayPath }}' - gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} + gpg-signing-key: ${{ secrets.GPG_SIGNING_KEY }} create-branch: 'true' signing-key-id: ${{ inputs.signing-key-id }} diff --git a/.github/workflows/build_templates.yml b/.github/workflows/build_templates.yml index d16b27b23e..7222224c17 100644 --- a/.github/workflows/build_templates.yml +++ b/.github/workflows/build_templates.yml @@ -57,5 +57,5 @@ jobs: with: branch-name: ${{ github.head_ref }} commit-message: 'chore: update templates for dependency changes' - gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} - signing_key_id: 2ED5FB11C6D5168EB9D69C5EF524010C7419CA66 + gpg-signing-key: ${{ secrets.GPG_SIGNING_KEY }} + signing-key-id: 2ED5FB11C6D5168EB9D69C5EF524010C7419CA66 diff --git a/.github/workflows/create_branch_prefix.yml b/.github/workflows/create_branch_prefix.yml index 29cab6ce6b..66d45a65a2 100644 --- a/.github/workflows/create_branch_prefix.yml +++ b/.github/workflows/create_branch_prefix.yml @@ -46,8 +46,8 @@ jobs: - uses: ./.github/actions/configure_git with: - gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} - signing_key_id: ${{ inputs.signing-key-id }} + gpg-signing-key: ${{ secrets.GPG_SIGNING_KEY }} + signing-key-id: ${{ inputs.signing-key-id }} - name: Create base branch run: git checkout -b ${{ steps.create-prefix.outputs.base-branch }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fb86242452..7d2ffbcc01 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -97,7 +97,7 @@ jobs: with: branch-name: ${{ needs.create-branch-prefix.outputs.base-branch }} commit-message: 'Prepare release ${{ inputs.release-version }}' - gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} + gpg-signing-key: ${{ secrets.GPG_SIGNING_KEY }} signing-key-id: ${{ inputs.signing-key-id }} - name: Publish to npm @@ -169,7 +169,7 @@ jobs: with: branch-name: ${{ steps.create-branch-name.outputs.branch-name }} commit-message: 'Update test files for ${{ matrix.test.displayPath }}' - gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} + gpg-signing-key: ${{ secrets.GPG_SIGNING_KEY }} create-branch: 'true' signing-key-id: ${{ inputs.signing-key-id }} diff --git a/.github/workflows/squash_branches.yml b/.github/workflows/squash_branches.yml index c59c1f0cd4..41c6ffa009 100644 --- a/.github/workflows/squash_branches.yml +++ b/.github/workflows/squash_branches.yml @@ -38,8 +38,8 @@ jobs: - uses: ./.github/actions/configure_git with: - gpg_signing_key: ${{ secrets.GPG_SIGNING_KEY }} - signing_key_id: ${{ inputs.signing-key-id }} + gpg-signing-key: ${{ secrets.GPG_SIGNING_KEY }} + signing-key-id: ${{ inputs.signing-key-id }} - name: Collect branches id: collect-branches run: | From 3bc1c52416cec0e8277d93153125e599d0c1af9d Mon Sep 17 00:00:00 2001 From: Benjamin DeMann Date: Thu, 19 Dec 2024 11:15:54 -0700 Subject: [PATCH 7/7] use dependabot key only for dependabot --- .github/workflows/build_templates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_templates.yml b/.github/workflows/build_templates.yml index 7222224c17..72e9e2cbab 100644 --- a/.github/workflows/build_templates.yml +++ b/.github/workflows/build_templates.yml @@ -58,4 +58,4 @@ jobs: branch-name: ${{ github.head_ref }} commit-message: 'chore: update templates for dependency changes' gpg-signing-key: ${{ secrets.GPG_SIGNING_KEY }} - signing-key-id: 2ED5FB11C6D5168EB9D69C5EF524010C7419CA66 + signing-key-id: ${{ needs.workflow-config.outputs.is-dependabot == 'true' && '2ED5FB11C6D5168EB9D69C5EF524010C7419CA66' || 'C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0' }}