From 9bd8b0e010aa95df3a9ad55be6455ea599dd7a94 Mon Sep 17 00:00:00 2001 From: rug Date: Thu, 19 Dec 2024 16:56:29 +0000 Subject: [PATCH 1/3] Access directly to github secrets --- .github/os-git-actions/setup-gpg/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/os-git-actions/setup-gpg/action.yml b/.github/os-git-actions/setup-gpg/action.yml index 33068ffb..59cb74a8 100644 --- a/.github/os-git-actions/setup-gpg/action.yml +++ b/.github/os-git-actions/setup-gpg/action.yml @@ -16,7 +16,7 @@ runs: - name: Import and load GPG key uses: crazy-max/ghaction-import-gpg@v6 with: - gpg_private_key: ${{ inputs.gpgPriv }} - passphrase: ${{ inputs.gpgPassPhrase }} + gpg_private_key: ${{ secrets.GPG_SIGN_KEY }} + passphrase: ${{ secrets.GPG_PASSPHRASE }} git_user_signingkey: true git_commit_gpgsign: true From 2e40ec88ef37be964c0cab24f3f8b3929cda353b Mon Sep 17 00:00:00 2001 From: rug Date: Thu, 19 Dec 2024 16:56:44 +0000 Subject: [PATCH 2/3] Remove input parameters --- .github/os-git-actions/setup-gpg/action.yml | 9 --------- .github/os-git-actions/signed-commit/action.yml | 11 ----------- .github/workflows/PreRelease.yml | 2 -- 3 files changed, 22 deletions(-) diff --git a/.github/os-git-actions/setup-gpg/action.yml b/.github/os-git-actions/setup-gpg/action.yml index 59cb74a8..ca8bd97b 100644 --- a/.github/os-git-actions/setup-gpg/action.yml +++ b/.github/os-git-actions/setup-gpg/action.yml @@ -1,14 +1,5 @@ name: 'setup-gpg' description: 'Prepare to get following commits signed' -inputs: - gpgPriv: - description: 'GPG Private key' - required: true - default: '' - gpgPassPhrase: - description: 'GPG passphrase' - required: false - default: '""' runs: using: composite diff --git a/.github/os-git-actions/signed-commit/action.yml b/.github/os-git-actions/signed-commit/action.yml index f200b112..6dfad311 100644 --- a/.github/os-git-actions/signed-commit/action.yml +++ b/.github/os-git-actions/signed-commit/action.yml @@ -13,23 +13,12 @@ inputs: description: 'Defines if a `git add.` should be made or not.' required: false default: false - gpgPriv: - description: 'GPG Private key' - required: true - default: '' - gpgPassPhrase: - description: 'GPG passphrase' - required: false - default: '""' runs: using: composite steps: - name: Setup GPG to sign commits uses: ./.github/os-git-actions/setup-gpg/ - with: - gpgPriv: ${{ inputs.gpgPriv }} - gpgPassPhrase: ${{ inputs.gpgPassPhrase }} - name: Perform git commit uses: ./.github/os-git-actions/manual-commit/ diff --git a/.github/workflows/PreRelease.yml b/.github/workflows/PreRelease.yml index 516514ab..46e6dcba 100644 --- a/.github/workflows/PreRelease.yml +++ b/.github/workflows/PreRelease.yml @@ -119,5 +119,3 @@ jobs: branch: dev message: 'Updated into v${{ inputs.new-dev-release }} [skip ci]' newFiles: true - gpgPriv: ${{ secrets.GPG_SIGN_KEY }} - gpgPassPhrase: ${{ secrets.GPG_PASSPHRASE }} From 0eda14a312207019c17fc88eea481309263c30d0 Mon Sep 17 00:00:00 2001 From: rug Date: Thu, 19 Dec 2024 16:56:54 +0000 Subject: [PATCH 3/3] Update for consistency version of action checkout --- .github/workflows/DevPR.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/DevPR.yml b/.github/workflows/DevPR.yml index 2c23ab68..3df51365 100644 --- a/.github/workflows/DevPR.yml +++ b/.github/workflows/DevPR.yml @@ -12,7 +12,7 @@ jobs: working-directory: ./ steps: - name: Checkout branch dev - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install project dependencies run: npm install @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout branch dev - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install project dependencies run: npm install