Skip to content

Commit 3701a3e

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 435807b + fe3df4b commit 3701a3e

File tree

3 files changed

+14
-35
lines changed

3 files changed

+14
-35
lines changed

.github/actions/docker-buildx-push/action.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ runs:
4848
flavor: |
4949
latest=false
5050
- name: Set up QEMU
51-
uses: docker/setup-qemu-action@v2
51+
uses: docker/setup-qemu-action@v3
5252
- name: Set up Docker Buildx
53-
uses: docker/setup-buildx-action@v2
53+
uses: docker/setup-buildx-action@v3
5454
- name: Login to GHCR
5555
uses: docker/login-action@v3
5656
if: inputs.ghcr-token != '' && github.event_name != 'pull_request'
@@ -60,7 +60,7 @@ runs:
6060
password: ${{ inputs.ghcr-token }}
6161
- name: Login to DockerHub
6262
if: inputs.dockerhub-token != '' && github.event_name != 'pull_request'
63-
uses: docker/login-action@v2
63+
uses: docker/login-action@v3
6464
with:
6565
username: ${{ inputs.dockerhub-user }}
6666
password: ${{ inputs.dockerhub-token }}

.github/actions/setup-env/action.yaml

+5-26
Original file line numberDiff line numberDiff line change
@@ -20,42 +20,21 @@ inputs:
2020
runs:
2121
using: "composite"
2222
steps:
23-
- name: Set up Node.js
24-
uses: actions/setup-node@v3
25-
with:
26-
node-version: ${{ inputs.node-version }}
27-
2823
- uses: pnpm/action-setup@v2
2924
name: Setup pnpm
30-
id: pnpm-install
3125
with:
3226
version: ${{ inputs.pnpm-version }}
33-
run_install: false
34-
35-
- name: Get pnpm store directory
36-
id: pnpm-cache
37-
shell: bash
38-
run: |
39-
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
4027

41-
- uses: actions/cache@v3
42-
name: Setup pnpm cache
28+
- name: Set up Node.js
29+
uses: actions/setup-node@v4
4330
with:
44-
path: ${{ steps.pnpm-cache.outputs.STORE_PATH}}
45-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
46-
restore-keys: |
47-
${{ runner.os }}-pnpm-store-
31+
node-version: ${{ inputs.node-version }}
32+
cache: 'pnpm'
33+
cache-dependency-path: 'ui/pnpm-lock.yaml'
4834

4935
- name: Setup JDK
5036
uses: actions/setup-java@v4
5137
with:
5238
distribution: "temurin"
5339
cache: "gradle"
5440
java-version: ${{ inputs.java-version }}
55-
56-
- name: Cache SonarCloud packages
57-
uses: actions/cache@v3
58-
with:
59-
path: ~/.sonar/cache
60-
key: ${{ runner.os }}-sonar
61-
restore-keys: ${{ runner.os }}-sonar

.github/workflows/halo.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ jobs:
2424
if: github.event_name == 'pull_request' || github.event_name == 'push'
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
- name: Setup Environment
2929
uses: ./.github/actions/setup-env
3030
- name: Check Halo
3131
run: ./gradlew check
3232
- name: Upload coverage reports to Codecov
33-
uses: codecov/codecov-action@v3
33+
uses: codecov/codecov-action@v4
3434

3535
build:
3636
runs-on: ubuntu-latest
3737
if: always() && (needs.test.result == 'skipped' || needs.test.result == 'success')
3838
needs: test
3939
steps:
40-
- uses: actions/checkout@v3
40+
- uses: actions/checkout@v4
4141
- name: Setup Environment
4242
uses: ./.github/actions/setup-env
4343
- name: Reset version of Halo
@@ -62,7 +62,7 @@ jobs:
6262
if: always() && needs.build.result == 'success' && github.event_name == 'release'
6363
needs: build
6464
steps:
65-
- uses: actions/checkout@v3
65+
- uses: actions/checkout@v4
6666
- name: Download Artifacts
6767
uses: actions/download-artifact@v4
6868
with:
@@ -78,7 +78,7 @@ jobs:
7878
runs-on: ubuntu-latest
7979
needs: build
8080
steps:
81-
- uses: actions/checkout@v3
81+
- uses: actions/checkout@v4
8282
- name: Download Artifacts
8383
uses: actions/download-artifact@v4
8484
with:
@@ -99,7 +99,7 @@ jobs:
9999
runs-on: ubuntu-latest
100100
needs: build
101101
steps:
102-
- uses: actions/checkout@v3
102+
- uses: actions/checkout@v4
103103
- name: Download Artifacts
104104
uses: actions/download-artifact@v4
105105
with:

0 commit comments

Comments
 (0)