Skip to content

Commit

Permalink
Merge pull request #144 from gabilang/fix-gradle-issues
Browse files Browse the repository at this point in the history
Fix issues with Java version and Gradle incremental build
  • Loading branch information
gabilang committed Aug 4, 2023
2 parents c72f65d + 48200f7 commit 4cf8a37
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-dev-branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: adopt
java-version: 17
java-version: 17.0.7
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand All @@ -42,7 +42,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: adopt
java-version: 17
java-version: 17.0.7
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: adopt
java-version: 17
java-version: 17.0.7
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/central-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17
java-version: 17.0.7
- name: Build with Gradle
env:
packageUser: ${{ github.actor }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/daily-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: adopt
java-version: 17
java-version: 17.0.7

# Build the project with Gradle
- name: Build with Gradle
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: adopt
java-version: 17
java-version: 17.0.7
- name: Set version env variable
run: echo "VERSION=$((grep -w 'version' | cut -d= -f2) < gradle.properties | rev | cut --complement -d- -f1 | rev)" >> $GITHUB_ENV
- name: Pre release depenency version update
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: adopt
java-version: 17
java-version: 17.0.7
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand All @@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: adopt
java-version: 17
java-version: 17.0.7
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
2 changes: 1 addition & 1 deletion prometheus-extension-ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ name = "prometheus"
version = "@toml.version@"
distribution = "2201.7.0"

[platform.java11]
[platform.java17]
graalvmCompatible = true
1 change: 1 addition & 0 deletions prometheus-extension-ballerina/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ task ballerinaBuild {
outputs.dir artifactCacheParent
outputs.dir artifactBallerinaDocs
outputs.dir artifactLibParent
doNotTrackState("build needs to run every time")
}

task createArtifactZip(type: Zip) {
Expand Down

0 comments on commit 4cf8a37

Please sign in to comment.