Skip to content

Commit 89c786d

Browse files
Merge remote-tracking branch 'origin/master'
2 parents 46f9e99 + 35a6aeb commit 89c786d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v4
12-
- uses: actions/setup-java@v4
12+
- uses: actions/setup-java@v5
1313
with:
1414
java-version: '21'
1515
distribution: 'temurin'

.github/workflows/test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Test
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
15+
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
1616
with:
1717
path: app/build
1818
key: ${{ runner.os }}-build-${{ hashFiles('app/build.gradle') }}
@@ -24,7 +24,7 @@ jobs:
2424
run: nix profile install github:TriliumNext/Trilium/27e6d1b00b53bcf1b9558fdc92da610460659dc6#server nixpkgs/master#imagemagick # v0.99.0
2525
- name: Run Trilium Server
2626
run: ./app/test/setup-test-server.sh
27-
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
27+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2828
with:
2929
java-version: '21'
3030
distribution: 'temurin'

0 commit comments

Comments
 (0)