From 5aecc1e4ddb6fcd07cc89140f16bb9f9038045da Mon Sep 17 00:00:00 2001 From: Ben Warner Date: Sat, 19 Oct 2024 14:01:16 +0100 Subject: [PATCH 1/2] Fix build on GitHub build servers --- For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/tools4j/tabular?shareId=XXXX-XXXX-XXXX-XXXX). --- .github/workflows/build.yml | 15 ++++++++++++--- build.gradle | 6 +++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c5436e7..7ec82db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,10 +24,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: 17 distribution: 'adopt' @@ -35,6 +35,15 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Cache Gradle Wrapper + uses: actions/cache@v2 + with: + path: | + ~/.gradle/wrapper/ + ~/.gradle/caches/ + key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Build with Gradle run: ${{ matrix.run }} - diff --git a/build.gradle b/build.gradle index 4b583ba..9d805a5 100644 --- a/build.gradle +++ b/build.gradle @@ -10,8 +10,8 @@ buildscript { plugins { id 'application' id 'groovy' - id 'org.openjfx.javafxplugin' version '0.1.0' - id 'org.beryx.runtime' version '1.12.5' + id 'org.openjfx.javafxplugin' version '0.0.10' + id 'org.beryx.runtime' version '1.12.6' } apply plugin: 'org.beryx.runtime' @@ -192,4 +192,4 @@ task copyTabularZipToDistDirectory(type: Copy) { task cleanStagingArea(type: Delete) { delete 'build/dist' -} \ No newline at end of file +} From 54bc090589e0f43119013983aa16250cc7b5b883 Mon Sep 17 00:00:00 2001 From: Ben Warner Date: Sat, 19 Oct 2024 14:07:03 +0100 Subject: [PATCH 2/2] --- .github/workflows/build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ec82db..7a5fdae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,6 +11,7 @@ on: jobs: build: runs-on: ${{ matrix.os }} + timeout-minutes: 60 strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] @@ -47,3 +48,9 @@ jobs: - name: Build with Gradle run: ${{ matrix.run }} + + post: + runs-on: ubuntu-latest + steps: + - name: Post job cleanup + run: echo "Post job cleanup"