Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[grpc] Update common files for branch master #741

Merged
merged 1 commit into from
Jul 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions .github/workflows/graalvm-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Build Matrix
uses: micronaut-projects/github-actions/graalvm/build-matrix@master
uses: micronaut-projects/github-actions/graalvm/build-matrix@latest-graalvm-changes
id: build-matrix
with:
graalvm: 'dev'
java: '17'
build:
needs: build_matrix
if: github.repository != 'micronaut-projects/micronaut-project-template'
Expand All @@ -39,21 +36,21 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Pre-Build Steps
uses: micronaut-projects/github-actions/graalvm/pre-build@master
uses: micronaut-projects/github-actions/graalvm/pre-build@latest-graalvm-changes
id: pre-build
with:
graalvm: ${{ matrix.graalvm }}
java: ${{ matrix.java }}
java: 'dev'
- name: Build Steps
uses: micronaut-projects/github-actions/graalvm/build@master
id: build
env:
GH_TOKEN_PUBLIC_REPOS_READONLY: ${{ secrets.GH_TOKEN_PUBLIC_REPOS_READONLY }}
GH_USERNAME: ${{ secrets.GH_USERNAME }}
GRAALVM_QUICK_BUILD: true
with:
nativeTestTask: ${{ matrix.native_test_task }}
- name: Post-Build Steps
uses: micronaut-projects/github-actions/graalvm/post-build@master
id: post-build
with:
java: ${{ matrix.java }}
java: 'dev'
14 changes: 6 additions & 8 deletions .github/workflows/graalvm-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Build Matrix
uses: micronaut-projects/github-actions/graalvm/build-matrix@master
uses: micronaut-projects/github-actions/graalvm/build-matrix@latest-graalvm-changes
id: build-matrix
with:
graalvm: 'latest'
java: '17'
build:
needs: build_matrix
if: github.repository != 'micronaut-projects/micronaut-project-template'
Expand All @@ -45,21 +42,22 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Pre-Build Steps
uses: micronaut-projects/github-actions/graalvm/pre-build@master
uses: micronaut-projects/github-actions/graalvm/pre-build@latest-graalvm-changes
id: pre-build
with:
graalvm: ${{ matrix.graalvm }}
java: ${{ matrix.java }}
distribution: 'graalvm-community'
java: '17'
- name: Build Steps
uses: micronaut-projects/github-actions/graalvm/build@master
id: build
env:
GH_TOKEN_PUBLIC_REPOS_READONLY: ${{ secrets.GH_TOKEN_PUBLIC_REPOS_READONLY }}
GH_USERNAME: ${{ secrets.GH_USERNAME }}
GRAALVM_QUICK_BUILD: true
with:
nativeTestTask: ${{ matrix.native_test_task }}
- name: Post-Build Steps
uses: micronaut-projects/github-actions/graalvm/post-build@master
id: post-build
with:
java: ${{ matrix.java }}
java: '17'
4 changes: 1 addition & 3 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
graalvm: [ 'latest']
java: ['17']
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
Expand Down Expand Up @@ -48,9 +47,8 @@ jobs:
- name: "🔧 Setup GraalVM CE"
uses: graalvm/setup-graalvm@v1
with:
version: ${{ matrix.graalvm }}
distribution: 'graalvm-community'
java-version: ${{ matrix.java }}
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: "🔧 Setup Gradle"
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ src/main/docs/resources/css/*.css
src/main/docs/resources/js/*.js
src/main/docs/resources/style/*.html
src/main/docs/resources/img/micronaut-logo-white.svg

# Ignore files generated by test-resources
**/.micronaut/test-resources/
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,13 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
Expand Down