Skip to content

Commit

Permalink
Merge pull request #582 from gradle/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
runningcode authored Sep 11, 2023
2 parents f9eaf24 + 0d631c4 commit fb68cd3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/wrapper-upgrade-execution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: git config --global url."https://unused-username:${TOKEN}@github.com/".insteadOf "https://github.com/"
- name: Import GPG key
uses: crazy-max/ghaction-import-gpg@d6f3f49f3345e29369fe57596a3ca8f94c4d2ca7
uses: crazy-max/ghaction-import-gpg@82a020f1f7f605c65dd2449b392a52c3fcfef7ef
with:
gpg_private_key: ${{ secrets.GH_BOT_PGP_PRIVATE_KEY }}
passphrase: ${{ secrets.GH_BOT_PGP_PASSPHRASE }}
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionW

plugins {
id("com.gradle.enterprise") version "3.14.1"
id("com.gradle.common-custom-user-data-gradle-plugin") version "1.11.1"
id("com.gradle.common-custom-user-data-gradle-plugin") version "1.11.2"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
}

Expand Down

0 comments on commit fb68cd3

Please sign in to comment.