From a38ba67c0635f5b7ba250fc26eba7f61eece7b26 Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Fri, 13 Dec 2024 15:30:41 +0100 Subject: [PATCH 1/7] Update Base.java alongside todo.txt [skip ci] --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ad66c02b37..952f396a56 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -93,9 +93,10 @@ jobs: architecture: ${{ matrix.arch }} - name: Setup Ant uses: cedx/setup-ant@v3 - - name: Write to todo.txt + - name: Write to `todo.txt` and update `Base.java` run: | echo "${{ needs.version.outputs.build_number }} (${{ needs.version.outputs.version }})" > todo.txt + perl -pi -e 's/static private final int REVISION = \d+;/static private final int REVISION = ${{ needs.version.outputs.build_number }};/g; s/static private String VERSION_NAME = "\d+";\s*\/\/\$NON-NLS-1\$/static private String VERSION_NAME = "${{ needs.version.outputs.build_number }}"; \/\/\$NON-NLS-1\$/g' app/src/processing/app/Base.java - name: Install Certificates for Code Signing if: ${{ matrix.os_prefix == 'macos' }} uses: apple-actions/import-codesign-certs@v3 From dbbcc45d7ef741d449e9a5183016b39586dd6346 Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Fri, 13 Dec 2024 16:15:04 +0100 Subject: [PATCH 2/7] Update step name [skip ci] --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 952f396a56..956b44df31 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -93,7 +93,7 @@ jobs: architecture: ${{ matrix.arch }} - name: Setup Ant uses: cedx/setup-ant@v3 - - name: Write to `todo.txt` and update `Base.java` + - name: Write build_number and revision to todo.txt and Base.java run: | echo "${{ needs.version.outputs.build_number }} (${{ needs.version.outputs.version }})" > todo.txt perl -pi -e 's/static private final int REVISION = \d+;/static private final int REVISION = ${{ needs.version.outputs.build_number }};/g; s/static private String VERSION_NAME = "\d+";\s*\/\/\$NON-NLS-1\$/static private String VERSION_NAME = "${{ needs.version.outputs.build_number }}"; \/\/\$NON-NLS-1\$/g' app/src/processing/app/Base.java From 59d1d9ae73acd84cdf9202350172ee551918de3a Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Sat, 14 Dec 2024 08:35:38 +0100 Subject: [PATCH 3/7] Update build.xml [skip ci] --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index 8ad556c119..f993408671 100644 --- a/build/build.xml +++ b/build/build.xml @@ -40,7 +40,7 @@ location="../processing-examples" /> - + From bc245a17fcd04288f41fb9cfc4c99fffb37eaeef Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Sat, 14 Dec 2024 08:36:21 +0100 Subject: [PATCH 4/7] Update release.yml [skip ci] --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 956b44df31..090cd2424f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 17 + java-version: 21 - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - name: Build with Gradle @@ -88,7 +88,7 @@ jobs: - name: Install Java uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' architecture: ${{ matrix.arch }} - name: Setup Ant From f8c1b086f27260dfc6e61c7d2d6d9e0d99d4c9e6 Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Sat, 14 Dec 2024 12:14:23 +0100 Subject: [PATCH 5/7] Revert "Update release.yml" This reverts commit bc245a17fcd04288f41fb9cfc4c99fffb37eaeef. --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 090cd2424f..956b44df31 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 21 + java-version: 17 - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - name: Build with Gradle @@ -88,7 +88,7 @@ jobs: - name: Install Java uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '17' distribution: 'temurin' architecture: ${{ matrix.arch }} - name: Setup Ant From b320162a124dd19cb341100cc50bf905bee7b355 Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Sat, 14 Dec 2024 12:14:25 +0100 Subject: [PATCH 6/7] Revert "Update build.xml" This reverts commit 59d1d9ae73acd84cdf9202350172ee551918de3a. --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index f993408671..8ad556c119 100644 --- a/build/build.xml +++ b/build/build.xml @@ -40,7 +40,7 @@ location="../processing-examples" /> - + From 45dccc1fb79ce0a5e8bdfd85e74de8b370e8c16a Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Wed, 15 Jan 2025 21:56:03 +0100 Subject: [PATCH 7/7] Create ci script to auto-compile libDifferent --- .github/workflows/different.yml | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/different.yml diff --git a/.github/workflows/different.yml b/.github/workflows/different.yml new file mode 100644 index 0000000000..aaf1473fdc --- /dev/null +++ b/.github/workflows/different.yml @@ -0,0 +1,40 @@ +name: Build libDifferent + +on: + push: + branches: + - main + paths: + - 'core/different/different.m' + - 'core/different/Makefile' + +jobs: + build-and-pr: + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Run make in core/different + run: | + cd core/different + make + + - name: Create Pull Request + uses: peter-evans/create-pull-request@v5 + with: + commit-message: 'Update generated files from make' + title: 'Update generated files from make' + body: | + This PR was automatically created after changes to: + - core/different/different.m + - core/different/Makefile + + The `make` command was run and these are the resulting changes. + branch: auto-different-updates + base: main \ No newline at end of file