diff options
| author | Edwin Jakobs <edwin@rndr.studio> | 2023-03-01 16:31:01 +0100 |
|---|---|---|
| committer | Edwin Jakobs <edwin@rndr.studio> | 2023-03-01 16:31:01 +0100 |
| commit | 1d51a766e1bb2f0bc84cc494e555f6b8a1059dea (patch) | |
| tree | bc0318638d2ecc6a135c3faf87dda42654e073a9 | |
| parent | 0e76bcd431d0225fdea6725d8369868407d2f837 (diff) | |
| download | art-playground-openrndr-1d51a766e1bb2f0bc84cc494e555f6b8a1059dea.tar.gz art-playground-openrndr-1d51a766e1bb2f0bc84cc494e555f6b8a1059dea.zip | |
Fix location of data inside macos app bundle, update workflows
| -rw-r--r-- | .github/workflows/build-on-commit.yaml | 4 | ||||
| -rw-r--r-- | .github/workflows/publish-binaries-linux-x64.yaml | 8 | ||||
| -rw-r--r-- | .github/workflows/publish-binaries-macos.yaml | 8 | ||||
| -rw-r--r-- | .github/workflows/publish-binaries-windows.yaml | 8 | ||||
| -rw-r--r-- | build.gradle.kts | 2 |
5 files changed, 18 insertions, 12 deletions
diff --git a/.github/workflows/build-on-commit.yaml b/.github/workflows/build-on-commit.yaml index 658ce15..3bbbba5 100644 --- a/.github/workflows/build-on-commit.yaml +++ b/.github/workflows/build-on-commit.yaml @@ -5,11 +5,11 @@ on: - master jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: 14 + java-version: 17 - name: Build sources run: ./gradlew build
\ No newline at end of file diff --git a/.github/workflows/publish-binaries-linux-x64.yaml b/.github/workflows/publish-binaries-linux-x64.yaml index 4eed920..2222ee8 100644 --- a/.github/workflows/publish-binaries-linux-x64.yaml +++ b/.github/workflows/publish-binaries-linux-x64.yaml @@ -13,14 +13,16 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 14 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 14 + java-version: 17 - name: Build with Gradle run: ./gradlew jpackageZip + - name: Rename jpackage zip + run: mv ./build/distributions/openrndr-application.zip ./build/distributions/openrndr-application-linux-x64.zip - name: Create Release - uses: ncipollo/release-action@v1.6.1 + uses: ncipollo/release-action@v1.12.0 id: create_release with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/publish-binaries-macos.yaml b/.github/workflows/publish-binaries-macos.yaml index e631eed..bc71782 100644 --- a/.github/workflows/publish-binaries-macos.yaml +++ b/.github/workflows/publish-binaries-macos.yaml @@ -13,14 +13,16 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 14 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 14 + java-version: 17 - name: Build with Gradle run: ./gradlew jpackageZip + - name: Rename jpackage zip + run: mv ./build/distributions/openrndr-application.zip ./build/distributions/openrndr-application-macos.zip - name: Create Release - uses: ncipollo/release-action@v1.6.1 + uses: ncipollo/release-action@v1.12.0 id: create_release with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/publish-binaries-windows.yaml b/.github/workflows/publish-binaries-windows.yaml index b6fb4a5..a155606 100644 --- a/.github/workflows/publish-binaries-windows.yaml +++ b/.github/workflows/publish-binaries-windows.yaml @@ -13,14 +13,16 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 14 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 14 + java-version: 17 - name: Build with Gradle run: ./gradlew jpackageZip + - name: Rename jpackage zip + run: mv ./build/distributions/openrndr-application.zip ./build/distributions/openrndr-application-windows.zip - name: Create Release - uses: ncipollo/release-action@v1.6.1 + uses: ncipollo/release-action@v1.12.0 id: create_release with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.gradle.kts b/build.gradle.kts index 270b759..6eba948 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -177,7 +177,7 @@ tasks { from("data") { include("**/*") } - into("build/jpackage/openrndr-application.app/data") + into("build/jpackage/openrndr-application.app/Content/Resources/data") } } } |