Skip to content

Commit

Permalink
Reverted to omitting the MacOS build. May revisit in the future.
Browse files Browse the repository at this point in the history
  • Loading branch information
EdgewareRoad committed Jun 20, 2024
1 parent 0d87f0e commit c15379f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest, macos-13, windows-latest, ubuntu-latest]
# os: [windows-latest, ubuntu-latest]
# os: [macos-latest, macos-13, windows-latest, ubuntu-latest]
os: [windows-latest, ubuntu-latest]
steps:
- uses: actions/[email protected]
- name: Set up JDK 21
Expand Down Expand Up @@ -91,5 +91,5 @@ jobs:
build/distributions/trivysummary-${{ steps.read-properties.outputs.trivysummary_version }}.zip
build/native/nativeCompile/trivysummary-windows-amd64-${{ steps.read-properties.outputs.trivysummary_version }}.exe
build/native/nativeCompile/trivysummary-linux-amd64-${{ steps.read-properties.outputs.trivysummary_version }}
build/native/nativeCompile/trivysummary-macos-x86-64-${{ steps.read-properties.outputs.trivysummary_version }}
build/native/nativeCompile/trivysummary-macos-aarch64-${{ steps.read-properties.outputs.trivysummary_version }}
# build/native/nativeCompile/trivysummary-macos-x86-64-${{ steps.read-properties.outputs.trivysummary_version }}
# build/native/nativeCompile/trivysummary-macos-aarch64-${{ steps.read-properties.outputs.trivysummary_version }}
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
sourceCompatibility = '21'
targetCompatibility = '21'
// Note, building on Java 21 but Spring Boot 6 still allows JDK 17 compatibility, so allow for this.
sourceCompatibility = '17'
targetCompatibility = '17'
}

application {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
trivysummary.version=3.1.0-SNAPSHOT
trivysummary.version=3.1.0

logging.level.root=ERROR

Expand Down

0 comments on commit c15379f

Please sign in to comment.