Skip to content

Commit 64328a7

Browse files
committed
gradle.properties does not need license
1 parent 5d151ca commit 64328a7

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

.github/actions/prepare_env/action.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,22 @@ runs:
1212
24
1313
21
1414
cache: 'gradle'
15-
- name: Set JDK21
15+
- name: Set JAVA_HOME_{N}
1616
shell: bash
1717
run: |
1818
if [[ -n "$JAVA_HOME_21_X64" ]]; then
19-
echo "JDK21=$JAVA_HOME_21_X64" >> $GITHUB_ENV
19+
echo "JAVA_HOME_21=$JAVA_HOME_21_X64" >> $GITHUB_ENV
2020
elif [[ -n "$JAVA_HOME_21_ARM64" ]]; then
21-
echo "JDK21=$JAVA_HOME_21_ARM64" >> $GITHUB_ENV
21+
echo "JAVA_HOME_21=$JAVA_HOME_21_ARM64" >> $GITHUB_ENV
2222
fi
23-
- name: Set JDK24
24-
shell: bash
25-
run: |
2623
if [[ -n "$JAVA_HOME_24_X64" ]]; then
27-
echo "JDK24=$JAVA_HOME_24_X64" >> $GITHUB_ENV
24+
echo "JAVA_HOME_24=$JAVA_HOME_24_X64" >> $GITHUB_ENV
2825
elif [[ -n "$JAVA_HOME_24_ARM64" ]]; then
29-
echo "JDK24=$JAVA_HOME_24_ARM64" >> $GITHUB_ENV
26+
echo "JAVA_HOME_24=$JAVA_HOME_24_ARM64" >> $GITHUB_ENV
3027
fi
3128
- name: Check Java environment
3229
shell: bash
3330
run: ./gradlew -q javaToolchains
34-
env:
35-
JDK21: ${{ env.JAVA_HOME_21_X64 || env.JAVA_HOME_21_ARM64 }}
3631
- name: Cache local SwiftPM repository
3732
if: matrix.os_version == 'jammy'
3833
uses: actions/cache@v4

.licenseignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ Makefile
3535
**/CMakeLists.txt
3636
**/*.jar
3737
**/generated/*.java
38+
gradle.properties
39+
**/gradle.properties
3840
**/generated/*.swift
3941
gradle/wrapper/gradle-wrapper.properties
4042
gradlew

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
org.gradle.java.installations.fromEnv=JAVA_HOME_24_X64,JAVA_HOME_24_ARM64,JAVA_HOME_21_X64,JAVA_HOME_21_ARM64
1+
org.gradle.java.installations.fromEnv=JAVA_HOME_24,JAVA_HOME_24_X64,JAVA_HOME_24_ARM64,JAVA_HOME_21,JAVA_HOME_21_X64,JAVA_HOME_21_ARM64

0 commit comments

Comments
 (0)