Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge remote-tracking branch 'origin/main' into feat/sdkmanrc-distrib…
…ution-support

# Conflicts:
#	dist/setup/index.js
#	src/setup-java.ts
  • Loading branch information
brunoborges committed Jul 7, 2026
commit 565fc6d75171b9fae186d9dc8a6a6c75be9dfa9a
6 changes: 6 additions & 0 deletions dist/setup/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -81581,6 +81581,9 @@ function run() {
architecture,
packageType,
checkLatest,
setDefault,
verifySignature,
verifySignaturePublicKey,
distributionName,
jdkFile,
toolchainIds
Expand All @@ -81596,6 +81599,9 @@ function run() {
architecture,
packageType,
checkLatest,
setDefault,
verifySignature,
verifySignaturePublicKey,
distributionName,
jdkFile,
toolchainIds
Expand Down
6 changes: 6 additions & 0 deletions src/setup-java.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ async function run() {
architecture,
packageType,
checkLatest,
setDefault,
verifySignature,
verifySignaturePublicKey,
distributionName,
jdkFile,
toolchainIds
Expand All @@ -97,6 +100,9 @@ async function run() {
architecture,
packageType,
checkLatest,
setDefault,
verifySignature,
verifySignaturePublicKey,
distributionName,
jdkFile,
toolchainIds
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.