Skip to content

Commit

Permalink
Build native binary in CI (fixes #894)
Browse files Browse the repository at this point in the history
  • Loading branch information
vorburger authored and cushon committed Feb 11, 2024
1 parent 77cb168 commit 3d9c8fa
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 6 deletions.
23 changes: 19 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
java: [21, 17, 11]
java: [GraalVM, 21, 17, 11]
experimental: [false]
include:
# Only test on macos and windows with a single recent JDK to avoid a
# Only test on MacOS and Windows with a single recent JDK to avoid a
# combinatorial explosion of test configurations.
- os: macos-latest
java: 21
Expand All @@ -43,6 +43,9 @@ jobs:
- os: ubuntu-latest
java: EA
experimental: true
- os: ubuntu-latest
java: GraalVM
experimental: false
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental }}
steps:
Expand All @@ -58,19 +61,31 @@ jobs:
with:
website: jdk.java.net
release: ${{ matrix.java }}
- name: "Set up JDK ${{ matrix.java }}"
if: ${{ matrix.java != 'EA' }}
- name: "Set up JDK ${{ matrix.java }} from Zulu"
if: ${{ matrix.java != 'EA' && matrix.java != 'GraalVM' }}
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: "zulu"
cache: "maven"
- name: "Set up JDK ${{ matrix.java }}"
if: ${{ matrix.java == 'GraalVM' }}
uses: graalvm/setup-graalvm@v1
with:
java-version: "21"
distribution: "graalvm-community"
github-token: ${{ secrets.GITHUB_TOKEN }}
native-image-job-reports: "true"
cache: "maven"
- name: "Install"
shell: bash
run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
- name: "Test"
shell: bash
run: mvn test -B
- name: "Native"
if: ${{ matrix.java == 'GraalVM' }}
run: mvn -Pnative -DskipTests package -pl core -am && util/test-native.sh

publish_snapshot:
name: "Publish snapshot"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ jobs:
run: |
git push origin "v${{ github.event.inputs.version }}"
- name: Add Jars to Release Entry
- name: Add Artifacts to Release Entry
uses: softprops/action-gh-release@v0.1.14
with:
draft: true
name: ${{ github.event.input.version }}
tag_name: "v${{ github.event.inputs.version }}"
target_commitish: ${{ env.TARGET_COMMITISH }}
files: |
core/target/google-java-format-*.jar
core/target/google-java-format*
eclipse_plugin/target/google-java-format-eclipse-plugin-*.jar
30 changes: 30 additions & 0 deletions util/test-native.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/usr/bin/env bash
# Copyright 2024 The Google Java Format Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

set -euox pipefail

time java -jar core/target/google-java-format-*-all-deps.jar || true

status=-1
chmod +x core/target/google-java-format
if time core/target/google-java-format; then
status=0
else
status=$?
fi
if [[ $status -ne 2 ]]; then
echo "google-java-format_linux (native) without arguments should have printed usage help and exited with 2, but did not :("
exit 1
fi

0 comments on commit 3d9c8fa

Please sign in to comment.