Skip to content

Commit c6e0bff

Browse files
Bump actions/upload-artifact from 3 to 4 (#269)
* Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Fix duplicate package names * Simplify build * Update vscode config * Update build script --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kaklakariada <kaklakariada@users.noreply.github.com>
1 parent e4549f6 commit c6e0bff

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ jobs:
4040
- uses: gradle/wrapper-validation-action@v1
4141

4242
- name: Cache SonarQube packages
43-
uses: actions/cache@v3
43+
uses: actions/cache@v4
4444
with:
4545
path: ~/.sonar/cache
4646
key: ${{ runner.os }}-java-${{ matrix.java }}-sonar
4747
restore-keys: ${{ runner.os }}-java-${{ matrix.java }}-sonar
4848

49-
- name: Build with Gradle
49+
- name: Build with Gradle using Java ${{ matrix.java }}
5050
run: |
5151
./gradlew build --info --warning-mode=summary -PskipFlakyTests=true -PjavaVersion=${{ matrix.java }}
5252
@@ -65,14 +65,14 @@ jobs:
6565
report_paths: '**/build/test-results/*/TEST-*.xml'
6666
github_token: ${{ secrets.GITHUB_TOKEN }}
6767

68-
- name: Archive executable jar
69-
uses: actions/upload-artifact@v3
68+
- name: Archive executable JAR for ${{ matrix.java }}
69+
uses: actions/upload-artifact@v4
7070
if: ${{ env.DEFAULT_JAVA == matrix.java && env.DEFAULT_OS == matrix.os }}
7171
with:
7272
name: packages
7373
path: jfxui/build/libs/white-rabbit-fx-*.jar
7474

75-
- name: Build native package for ${{ runner.os }}
75+
- name: Build native package for ${{ runner.os }} using Java ${{ matrix.java }}
7676
if: ${{ env.DEFAULT_JAVA == matrix.java }}
7777
run: |
7878
./gradlew jpackage createChecksums --info --warning-mode=summary -PjavaVersion=${{ matrix.java }}
@@ -82,16 +82,16 @@ jobs:
8282
./gradlew -status
8383
./gradlew -stop
8484
85-
- name: Archive native package
86-
uses: actions/upload-artifact@v3
85+
- name: Archive native package for ${{ runner.os }}
86+
uses: actions/upload-artifact@v4
8787
if: ${{ env.DEFAULT_JAVA == matrix.java }}
8888
with:
89-
name: packages
89+
name: packages-${{ runner.os }}
9090
path: jfxui/build/jpackage-dist/*
9191

92-
- name: Archive checksums
93-
uses: actions/upload-artifact@v3
92+
- name: Archive checksums for ${{ runner.os }}
93+
uses: actions/upload-artifact@v4
9494
if: ${{ env.DEFAULT_JAVA == matrix.java }}
9595
with:
96-
name: checksums
96+
name: checksums-${{ runner.os }}
9797
path: jfxui/build/generatedChecksums/*

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ jobs:
1818

1919
strategy:
2020
fail-fast: false
21-
matrix:
22-
language: ['java']
2321

2422
steps:
2523
- name: Checkout repository
@@ -38,7 +36,7 @@ jobs:
3836
- name: Initialize CodeQL
3937
uses: github/codeql-action/init@v3
4038
with:
41-
languages: ${{ matrix.language }}
39+
languages: java
4240

4341
- name: Autobuild
4442
uses: github/codeql-action/autobuild@v3

.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
".idea/": true,
1111
},
1212
"editor.codeActionsOnSave": {
13-
"source.organizeImports": true,
14-
"source.fixAll": true,
13+
"source.organizeImports": "explicit",
14+
"source.fixAll": "explicit"
1515
},
1616
"java.codeGeneration.useBlocks": true,
1717
"editor.formatOnSave": true,

0 commit comments

Comments
 (0)