From 052cce064c9904b5fd03df0d3120e113f5a1e33f Mon Sep 17 00:00:00 2001 From: TJ Silver <15648334+tjsilver@users.noreply.github.com> Date: Thu, 17 Oct 2024 17:51:40 +0100 Subject: [PATCH] fix: explicitly install java in sbt dep submission workflow (#1303) --- .../src/file-generator.test.ts | 12 +++++++++--- .../src/file-generator.ts | 15 ++++++++++++--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/packages/dependency-graph-integrator/src/file-generator.test.ts b/packages/dependency-graph-integrator/src/file-generator.test.ts index fea361bf..f5247a26 100644 --- a/packages/dependency-graph-integrator/src/file-generator.test.ts +++ b/packages/dependency-graph-integrator/src/file-generator.test.ts @@ -17,9 +17,15 @@ jobs: steps: - name: Checkout branch id: checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + - name: Install Java + id: java + uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.2.0 + with: + distribution: corretto + java-version: 17 - name: Install sbt - id: install + id: sbt uses: sbt/setup-sbt@8a071aa780c993c7a204c785d04d3e8eb64ef272 # v1.1.0 - name: Submit dependencies id: submit @@ -53,7 +59,7 @@ jobs: steps: - name: Checkout branch id: checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - name: Set up Java id: setup uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 diff --git a/packages/dependency-graph-integrator/src/file-generator.ts b/packages/dependency-graph-integrator/src/file-generator.ts index 86dd3853..54b3caf3 100644 --- a/packages/dependency-graph-integrator/src/file-generator.ts +++ b/packages/dependency-graph-integrator/src/file-generator.ts @@ -16,11 +16,20 @@ function createLanguageSpecificWorkflowSteps( { name: 'Checkout branch', id: 'checkout', - uses: 'actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7', + uses: 'actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1', + }, + { + name: 'Install Java', + id: 'java', + uses: 'actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.2.0', + with: { + distribution: 'corretto', + 'java-version': '17', + }, }, { name: 'Install sbt', - id: 'install', + id: 'sbt', uses: 'sbt/setup-sbt@8a071aa780c993c7a204c785d04d3e8eb64ef272 # v1.1.0', }, { @@ -38,7 +47,7 @@ function createLanguageSpecificWorkflowSteps( { name: 'Checkout branch', id: 'checkout', - uses: 'actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7', + uses: 'actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1', }, { name: 'Set up Java',