Skip to content

Commit 0999e77

Browse files
Revert CI changes, install pnpm via maven plugin
1 parent 794a200 commit 0999e77

File tree

3 files changed

+3
-20
lines changed

3 files changed

+3
-20
lines changed

.github/workflows/check.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ on:
4545
default: ''
4646
required: false
4747

48-
pnpm-version:
49-
type: string
50-
description: "pnpm version to use for builds (default: none)"
51-
default: ''
52-
required: false
53-
5448
needs-maven-cache:
5549
type: boolean
5650
description: "Whether to restore Maven cache before run (default: yes)"
@@ -173,7 +167,6 @@ jobs:
173167
with:
174168
path: |
175169
~/.pnpm-store
176-
**/node_modules
177170
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
178171
restore-keys: |
179172
${{ runner.os }}-pnpm-
@@ -226,12 +219,6 @@ jobs:
226219
distribution: 'temurin'
227220
java-version: ${{ inputs.java-version }}
228221

229-
- name: Setup pnpm version ${{ inputs.pnpm-version }}
230-
if: ${{ inputs.pnpm-version }}
231-
uses: pnpm/action-setup@v4
232-
with:
233-
version: ${{ inputs.pnpm-version }}
234-
235222
- name: Execute pre-test steps
236223
if: ${{ inputs.pre-script }}
237224
run: |

.github/workflows/ci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ env:
3030
BUILD_ARGS: "-Pdist -Psrc -Dmaven.javadoc.skip=true -Drocks_tools_native"
3131
# Minimum required Java version for running Ozone is defined in pom.xml (javac.version).
3232
TEST_JAVA_VERSION: 21 # JDK version used by CI build and tests; should match the JDK version in apache/ozone-runner image
33-
PNPM_VERSION: 8.15.7 # This is defined in the pom.xml file with pnpm.version, should be updated accordingly
3433
# MAVEN_ARGS and MAVEN_OPTS are duplicated in check.yml, please keep in sync
3534
MAVEN_ARGS: --batch-mode --settings ${{ github.workspace }}/dev-support/ci/maven-settings.xml
3635
MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3
@@ -55,7 +54,6 @@ jobs:
5554
# `env` context cannot be used when calling reusable workflow, so we need to convert these to `outputs`
5655
build-args: ${{ env.BUILD_ARGS }}
5756
java-version: ${{ env.TEST_JAVA_VERSION }}
58-
pnpm-version: ${{ env.PNPM_VERSION }}
5957
with-coverage: ${{ env.OZONE_WITH_COVERAGE }}
6058
steps:
6159
- name: "Checkout ${{ github.ref }} / ${{ github.sha }} (push)"
@@ -116,7 +114,6 @@ jobs:
116114
if: needs.build-info.outputs.needs-build == 'true' || needs.build-info.outputs.needs-integration-tests == 'true'
117115
uses: ./.github/workflows/check.yml
118116
with:
119-
pnpm-version: ${{ needs.build-info.outputs.pnpm-version }}
120117
java-version: ${{ needs.build-info.outputs.java-version }}
121118
needs-npm-cache: true
122119
ratis-args: ${{ inputs.ratis_args }}

hadoop-ozone/recon/pom.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -415,16 +415,15 @@
415415
<npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven>
416416
<installDirectory>target</installDirectory>
417417
<workingDirectory>${basedir}/src/main/resources/webapps/recon/ozone-recon-web</workingDirectory>
418+
<nodeVersion>v${nodejs.version}</nodeVersion>
419+
<pnpmVersion>${pnpm.version}</pnpmVersion>
418420
</configuration>
419421
<executions>
420422
<execution>
421423
<id>Install node and npm locally to the project</id>
422424
<goals>
423-
<goal>install-node-and-npm</goal>
425+
<goal>install-node-and-pnpm</goal>
424426
</goals>
425-
<configuration>
426-
<nodeVersion>v${nodejs.version}</nodeVersion>
427-
</configuration>
428427
</execution>
429428
<execution>
430429
<id>set pnpm@${pnpm.version} store path</id>

0 commit comments

Comments
 (0)