Skip to content

Commit

Permalink
build(ci): adapt build pipeline for the generator API
Browse files Browse the repository at this point in the history
build(ci): make "Compare Binding Hash" job also took into account generated and include folders

build(ci): add JDK 11 to the setup-java pipeline

This is required for the buildSrc module, since it uses "spoon" library, which is compiled for JDK11.

build(ci): keep only JDK11

- Add source ant target compatibility output to the MANIFEST.mf file

build: add auto-provisioning for JDK

just in case
  • Loading branch information
SpaiR committed Aug 8, 2024
1 parent 4e884a1 commit 1c396fb
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 9 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v4
with:
java-version: 8
distribution: liberica
java-version: 11
cache: gradle

- name: Build
Expand Down Expand Up @@ -68,8 +68,8 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v4
with:
java-version: 8
distribution: liberica
java-version: 11
cache: gradle

- name: Install Dependencies (for Windows build)
Expand Down Expand Up @@ -124,6 +124,8 @@ jobs:
touch bin/binding.sha1
cat bin/binding.sha1 > /tmp/hash
find imgui-binding/src/main -type f -print0 | sort -z | xargs -0 sha1sum > bin/binding.sha1
find imgui-binding/src/generated -type f -print0 | sort -z | xargs -0 sha1sum >> bin/binding.sha1
find include -type f -print0 | sort -z | xargs -0 sha1sum >> bin/binding.sha1
cmp /tmp/hash bin/binding.sha1
- name: Update
Expand Down Expand Up @@ -151,8 +153,8 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v4
with:
java-version: 8
distribution: liberica
java-version: 11
cache: gradle

- name: Download Artifacts
Expand Down
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ allprojects {
'Build-Timestamp': new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(System.currentTimeMillis()),
'Build-Revision': 'git rev-parse HEAD'.execute().text.trim(),
'Build-Jdk': "${System.getProperty('java.version')} (${System.getProperty('java.vendor')})",
'Source-Compatibility': tasks.withType(JavaCompile).find().sourceCompatibility,
'Target-Compatibility': tasks.withType(JavaCompile).find().targetCompatibility,
'Created-By': "Gradle ${gradle.gradleVersion}"
)
}
Expand Down
6 changes: 0 additions & 6 deletions settings.gradle

This file was deleted.

10 changes: 10 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
}

rootProject.name = "imgui-java"
include("imgui-binding")
include("imgui-lwjgl3")
include("imgui-binding-natives")
include("imgui-app")
include("example")

0 comments on commit 1c396fb

Please sign in to comment.