From bd02adac5806651ee1a763b700fb8f6ef222da93 Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Sat, 11 Oct 2025 16:55:32 +0100 Subject: [PATCH 01/10] test swig install --- .github/workflows/pr.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index bf138c4591..01e263f6c6 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -82,6 +82,8 @@ jobs: echo "/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH echo "/home/linuxbrew/.linuxbrew/bin" >> $GITHUB_PATH cd ~ + cd "$(brew --repo homebrew/core)" + git checkout 3b3300546b5a4e40b74f4ee33cf225cca280defe curl -L ${{ vars.VERSION_SWIG}} > swig.rb && HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=true brew install swig.rb - name: Build JNI Stub From 407c76db1f7dd4faa4e036d7f7fbdeed4675e833 Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Sat, 11 Oct 2025 17:09:24 +0100 Subject: [PATCH 02/10] test --- .github/workflows/pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 01e263f6c6..8d503ae95a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -82,6 +82,7 @@ jobs: echo "/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH echo "/home/linuxbrew/.linuxbrew/bin" >> $GITHUB_PATH cd ~ + brew tap homebrew/core cd "$(brew --repo homebrew/core)" git checkout 3b3300546b5a4e40b74f4ee33cf225cca280defe curl -L ${{ vars.VERSION_SWIG}} > swig.rb && HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=true brew install swig.rb From 7c41a0ffa44fd0116ce67c8d27385dba5a5bb3bd Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Sat, 11 Oct 2025 17:13:39 +0100 Subject: [PATCH 03/10] test --- .github/workflows/pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 8d503ae95a..294978bd27 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -82,10 +82,10 @@ jobs: echo "/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH echo "/home/linuxbrew/.linuxbrew/bin" >> $GITHUB_PATH cd ~ - brew tap homebrew/core + brew tap homebrew/core --force cd "$(brew --repo homebrew/core)" git checkout 3b3300546b5a4e40b74f4ee33cf225cca280defe - curl -L ${{ vars.VERSION_SWIG}} > swig.rb && HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=true brew install swig.rb + curl -L ${{ vars.VERSION_SWIG}} > swig.rb && HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=true brew install swig.rb --force - name: Build JNI Stub working-directory: ./packages From 7c4bab090aa39b06e83a48b98cd6311175847cfa Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Sat, 11 Oct 2025 17:26:49 +0100 Subject: [PATCH 04/10] test --- .github/workflows/pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 294978bd27..d3c65e2cb9 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -84,6 +84,7 @@ jobs: cd ~ brew tap homebrew/core --force cd "$(brew --repo homebrew/core)" + git fetch --unshallow git checkout 3b3300546b5a4e40b74f4ee33cf225cca280defe curl -L ${{ vars.VERSION_SWIG}} > swig.rb && HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=true brew install swig.rb --force From 497caf4fe943daa6587abe2b7799b0c96d49c452 Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Sat, 11 Oct 2025 17:37:08 +0100 Subject: [PATCH 05/10] test --- .github/workflows/pr.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d3c65e2cb9..496b4b74c7 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -84,8 +84,7 @@ jobs: cd ~ brew tap homebrew/core --force cd "$(brew --repo homebrew/core)" - git fetch --unshallow - git checkout 3b3300546b5a4e40b74f4ee33cf225cca280defe + git checkout 4.1.1 curl -L ${{ vars.VERSION_SWIG}} > swig.rb && HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=true brew install swig.rb --force - name: Build JNI Stub From 8b0e72dc85222e2f3746da92ebd66aedc3f9eb15 Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Sat, 11 Oct 2025 17:59:06 +0100 Subject: [PATCH 06/10] test --- .github/workflows/pr.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 496b4b74c7..e5b2f22cab 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -81,11 +81,8 @@ jobs: echo "eval \"\$($(brew --prefix)/bin/brew shellenv)\"" >> ~/.profile echo "/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH echo "/home/linuxbrew/.linuxbrew/bin" >> $GITHUB_PATH - cd ~ - brew tap homebrew/core --force - cd "$(brew --repo homebrew/core)" - git checkout 4.1.1 - curl -L ${{ vars.VERSION_SWIG}} > swig.rb && HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=true brew install swig.rb --force + cd ~ + curl -L ${{ vars.VERSION_SWIG}} > swig.rb && HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=true brew install swig - name: Build JNI Stub working-directory: ./packages From b3c3ea1815a2bdca6736137c659974ba7e31d351 Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Sat, 11 Oct 2025 18:28:37 +0100 Subject: [PATCH 07/10] test --- .github/workflows/pr.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e5b2f22cab..f2018d6e02 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -82,7 +82,7 @@ jobs: echo "/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH echo "/home/linuxbrew/.linuxbrew/bin" >> $GITHUB_PATH cd ~ - curl -L ${{ vars.VERSION_SWIG}} > swig.rb && HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=true brew install swig + HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=true brew install swig - name: Build JNI Stub working-directory: ./packages @@ -580,8 +580,7 @@ jobs: echo "eval \"\$($(brew --prefix)/bin/brew shellenv)\"" >> ~/.profile echo "/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH echo "/home/linuxbrew/.linuxbrew/bin" >> $GITHUB_PATH - cd ~ - curl -L ${{ vars.VERSION_SWIG}} > swig.rb && HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=true brew install swig.rb + HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=true brew install swig - name: Install JSON parser run: brew install jq From 420ae549fae471e973c7c881aa529be2e71cbbcf Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Sat, 11 Oct 2025 22:27:29 +0100 Subject: [PATCH 08/10] test --- .github/workflows/pr.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f2018d6e02..46cf2bd9bd 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -992,7 +992,7 @@ jobs: - type: sync test-title: Unit Test Results - Android Sync (Emulator) - runs-on: macos-12 # android emulator does not run on arm64 - https://github.com/ReactiveCircus/android-emulator-runner/issues/350 + runs-on: macos-13 # android emulator does not run on arm64 - https://github.com/ReactiveCircus/android-emulator-runner/issues/350 needs: [check-cache, build-android-packages, build-jvm-packages, build-kotlin-metadata-package] if: | always() && @@ -1238,15 +1238,15 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12, macos-14] + os: [macos-13, macos-14] type: [base, sync] include: - - os: macos-12 + - os: macos-13 type: base os-id: macos package-prefix: macos-x64 test-title: Unit Test Results - MacOS x64 Base - - os: macos-12 + - os: macos-13 type: sync os-id: macos package-prefix: macos-x64 @@ -1367,15 +1367,15 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12, macos-14] + os: [macos-13, macos-14] type: [base, sync] include: - - os: macos-12 + - os: macos-13 type: base package-prefix: x64 test-title: Unit Test Results - iOS x64 Base test-task: iosTest - - os: macos-12 + - os: macos-13 type: sync package-prefix: x64 test-title: Unit Test Results - iOS x64 Sync @@ -1496,10 +1496,10 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12, macos-14, ubuntu-latest, windows-latest] + os: [macos-13, macos-14, ubuntu-latest, windows-latest] type: [base, sync] include: - - os: macos-12 + - os: macos-13 os-id: mac type: base test-title: Unit Test Results - Base JVM MacOS x64 @@ -1515,7 +1515,7 @@ jobs: os-id: win type: base test-title: Unit Test Results - Base JVM Windows - - os: macos-12 + - os: macos-13 os-id: mac type: sync test-title: Unit Test Results - Sync JVM MacOS x64 From 466853b2b52671ae421864ae00bb6b52c39a51f0 Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Sat, 11 Oct 2025 22:58:05 +0100 Subject: [PATCH 09/10] test --- .github/workflows/pr.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 46cf2bd9bd..104ca9d5d2 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -985,12 +985,10 @@ jobs: strategy: fail-fast: false matrix: - type: [base, sync] + type: [base] include: - type: base test-title: Unit Test Results - Android Base (Emulator) - - type: sync - test-title: Unit Test Results - Android Sync (Emulator) runs-on: macos-13 # android emulator does not run on arm64 - https://github.com/ReactiveCircus/android-emulator-runner/issues/350 needs: [check-cache, build-android-packages, build-jvm-packages, build-kotlin-metadata-package] @@ -1026,12 +1024,18 @@ jobs: # curl: option --data: error encountered when reading a file OUTPUT=$(bash cli.sh start | jq -r '.id') echo "baas_container_id=$OUTPUT" >> $GITHUB_OUTPUT - - - name: Setup Java 11 + + - name: Set up JDK 17 uses: actions/setup-java@v4 with: - distribution: ${{ vars.VERSION_JAVA_DISTRIBUTION }} - java-version: ${{ vars.VERSION_JAVA }} + java-version: '17' + distribution: 'temurin' + + # - name: Setup Java 11 + # uses: actions/setup-java@v4 + # with: + # distribution: ${{ vars.VERSION_JAVA_DISTRIBUTION }} + # java-version: ${{ vars.VERSION_JAVA }} - name: Setup Gradle and task/dependency caching uses: gradle/actions/setup-gradle@v3 From cca03476610f11ab4d20c53303a854131e926a21 Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Sat, 11 Oct 2025 23:44:19 +0100 Subject: [PATCH 10/10] using macos-13 --- .github/workflows/include-deploy-release.yml | 2 +- .github/workflows/include-integration-tests.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/include-deploy-release.yml b/.github/workflows/include-deploy-release.yml index 7afc19995c..c4c108362d 100644 --- a/.github/workflows/include-deploy-release.yml +++ b/.github/workflows/include-deploy-release.yml @@ -13,7 +13,7 @@ on: jobs: deploy: - runs-on: macos-12 + runs-on: macos-13 name: Deploy release steps: diff --git a/.github/workflows/include-integration-tests.yml b/.github/workflows/include-integration-tests.yml index 2d3349ec8e..2b19436924 100644 --- a/.github/workflows/include-integration-tests.yml +++ b/.github/workflows/include-integration-tests.yml @@ -87,7 +87,7 @@ jobs: ./gradlew assembleDebug jvmJar realm-java-compatibiliy: - runs-on: macos-12 + runs-on: macos-13 steps: - name: Checkout code uses: actions/checkout@v4 @@ -211,7 +211,7 @@ jobs: - type: gradle75 path: integration-tests/gradle/gradle75-test arguments: integrationTest - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4 @@ -292,7 +292,7 @@ jobs: - type: gradle85 path: integration-tests/gradle/gradle85-test arguments: integrationTest - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4