Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
ewilliams-cloudera committed Nov 12, 2024
1 parent 040cadc commit 57c3014
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 41 deletions.
32 changes: 13 additions & 19 deletions .github/workflows/pr_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.BRANCH }}

- name: Set up JDK 21
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
Expand All @@ -29,36 +29,30 @@ jobs:
run: ./gradlew build
working-directory: api

- name: Use Node.js
uses: actions/setup-node@v3
- uses: pnpm/action-setup@v4
name: Install pnpm
with:
node-version: 20
version: 9

- name: Cache pnpm
uses: actions/cache@v3
- name: Use Node.js
uses: actions/setup-node@v4
with:
path: ui/node_modules
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/package.json') }}
restore-keys: |
${{ runner.os }}-pnpm-
- name: Install PNPM
run: npm --dd install @pnpm/exe
node-version: 20
cache: 'pnpm'

- name: Install UI Dependencies
run: ../node_modules/\@pnpm/exe/pnpm install --no-frozen-lockfile
run: pnpm install --no-frozen-lockfile
working-directory: ui

- name: Lint with PNPM
run: ../node_modules/\@pnpm/exe/pnpm lint
run: pnpm lint
working-directory: ui

- name: Run frontend tests
run: |
../node_modules/\@pnpm/exe/pnpm test
run: pnpm test
working-directory: ui

- name: Build with PNPM
run: ../node_modules/\@pnpm/exe/pnpm build
run: pnpm build
working-directory: ui

36 changes: 14 additions & 22 deletions .github/workflows/publish_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.BRANCH }}

- name: Set up JDK 21
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
Expand All @@ -40,41 +40,33 @@ jobs:
- name: Build with Gradle
run: ./gradlew build
working-directory: api

- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 20

- name: Cache pnpm
uses: actions/cache@v3
- uses: pnpm/action-setup@v4
name: Install pnpm
with:
path: |
ui/node_modules
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/package.json') }}
restore-keys: |
${{ runner.os }}-pnpm-
version: 9

- name: Install PNPM
run: |
npm --dd install @pnpm/exe
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'

- name: Install UI Dependencies
run: ../node_modules/\@pnpm/exe/pnpm install --no-frozen-lockfile
run: pnpm install --no-frozen-lockfile
working-directory: ui

- name: Lint with PNPM
run: ../node_modules/\@pnpm/exe/pnpm lint
run: pnpm lint
working-directory: ui

- name: Run frontend tests
run: |
../node_modules/\@pnpm/exe/pnpm test
run: pnpm test
working-directory: ui

- name: Install and build with pnpm
run: |
../node_modules/\@pnpm/exe/pnpm build
pnpm build
tar --no-xattrs -czvf fe-dist.tar.gz dist
working-directory: ui

Expand Down

0 comments on commit 57c3014

Please sign in to comment.