From bd1ac83994be09b9744129d5ee9a058b2d0ed1cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Nov 2021 03:56:17 +0000 Subject: [PATCH 1/2] Bump crazy-max/ghaction-import-gpg from 3 to 4.1.0 Bumps [crazy-max/ghaction-import-gpg](https://github.com/crazy-max/ghaction-import-gpg) from 3 to 4.1.0. - [Release notes](https://github.com/crazy-max/ghaction-import-gpg/releases) - [Changelog](https://github.com/crazy-max/ghaction-import-gpg/blob/master/CHANGELOG.md) - [Commits](https://github.com/crazy-max/ghaction-import-gpg/compare/v3...v4.1.0) --- updated-dependencies: - dependency-name: crazy-max/ghaction-import-gpg dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/rebase-action.yml | 2 +- .github/workflows/release-action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rebase-action.yml b/.github/workflows/rebase-action.yml index 7828ebf..29173da 100644 --- a/.github/workflows/rebase-action.yml +++ b/.github/workflows/rebase-action.yml @@ -14,7 +14,7 @@ jobs: with: fetch-depth: 0 - name: Import GPG key - uses: crazy-max/ghaction-import-gpg@v3 + uses: crazy-max/ghaction-import-gpg@v4.1.0 with: gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} passphrase: ${{ secrets.GPG_PASSPHRASE }} diff --git a/.github/workflows/release-action.yml b/.github/workflows/release-action.yml index c3b72b0..4936bf3 100644 --- a/.github/workflows/release-action.yml +++ b/.github/workflows/release-action.yml @@ -13,7 +13,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - name: Import GPG key - uses: crazy-max/ghaction-import-gpg@v3 + uses: crazy-max/ghaction-import-gpg@v4.1.0 with: gpg-private-key: "${{ secrets.GPG_PRIVATE_KEY }}" passphrase: "${{ secrets.GPG_PASSPHRASE }}" From caba140ec92020c930c8d5887666a145d392de9f Mon Sep 17 00:00:00 2001 From: Ethan Dye Date: Mon, 29 Nov 2021 21:01:13 -0700 Subject: [PATCH 2/2] Update workflows for upstream changes Signed-off-by: Ethan Dye --- .github/workflows/rebase-action.yml | 6 +++--- .github/workflows/release-action.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rebase-action.yml b/.github/workflows/rebase-action.yml index 29173da..f261007 100644 --- a/.github/workflows/rebase-action.yml +++ b/.github/workflows/rebase-action.yml @@ -16,10 +16,10 @@ jobs: - name: Import GPG key uses: crazy-max/ghaction-import-gpg@v4.1.0 with: - gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} passphrase: ${{ secrets.GPG_PASSPHRASE }} - git-user-signingkey: true - git-commit-gpgsign: true + git_user_signingkey: true + git_commit_gpgsign: true - name: Rebase openHAB branches run: | git config --global user.name 'Ethan Dye' diff --git a/.github/workflows/release-action.yml b/.github/workflows/release-action.yml index 4936bf3..addc89c 100644 --- a/.github/workflows/release-action.yml +++ b/.github/workflows/release-action.yml @@ -15,7 +15,7 @@ jobs: - name: Import GPG key uses: crazy-max/ghaction-import-gpg@v4.1.0 with: - gpg-private-key: "${{ secrets.GPG_PRIVATE_KEY }}" + gpg_private_key: "${{ secrets.GPG_PRIVATE_KEY }}" passphrase: "${{ secrets.GPG_PASSPHRASE }}" - name: "Archive zram-config" run: |