From 5c964f556a3633e368f91e1fd38c207bc28313f1 Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Tue, 24 Feb 2026 13:17:33 +0100 Subject: [PATCH 1/5] bump: Update macos image --- src/executors/osx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/executors/osx.yml b/src/executors/osx.yml index 5089e5af..44bd6960 100644 --- a/src/executors/osx.yml +++ b/src/executors/osx.yml @@ -3,6 +3,6 @@ description: > https://circleci.com/docs/2.0/configuration-reference/#macos macos: - xcode: "13.4.1" + xcode: "26.3.0" working_directory: ~/workdir From 32f6f0320f1479ea3b1180dcf6f109923b172245 Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Tue, 24 Feb 2026 15:56:15 +0100 Subject: [PATCH 2/5] . --- src/jobs/sbt_osx.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jobs/sbt_osx.yml b/src/jobs/sbt_osx.yml index 077fe778..54121773 100644 --- a/src/jobs/sbt_osx.yml +++ b/src/jobs/sbt_osx.yml @@ -62,8 +62,8 @@ steps: # Pin openjdk version << parameters.openjdk_version >> brew install openjdk@${OJDK_VERSION} sudo ln -sfn /usr/local/opt/openjdk@${OJDK_VERSION}/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-${OJDK_VERSION}.jdk - echo 'export PATH="/usr/local/opt/openjdk@${OJDK_VERSION}/bin:$PATH"' >> /Users/distiller/.bash_profile - export CPPFLAGS="-I/usr/local/opt/openjdk@${OJDK_VERSION}/include" + echo "export PATH=\"/usr/local/opt/openjdk@${OJDK_VERSION}/bin:$PATH\"" >> $BASH_ENV + echo "export CPPFLAGS=\"-I/usr/local/opt/openjdk@${OJDK_VERSION}/include\"" >> $BASH_ENV # Install sbt without overriding openjdk brew install --ignore-dependencies sbt - run: From 54c98fd8ab7bc3a0cc765e5d11ae0de290a5af0d Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Tue, 24 Feb 2026 16:18:41 +0100 Subject: [PATCH 3/5] . --- src/jobs/sbt_osx.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/jobs/sbt_osx.yml b/src/jobs/sbt_osx.yml index 54121773..576891cf 100644 --- a/src/jobs/sbt_osx.yml +++ b/src/jobs/sbt_osx.yml @@ -62,8 +62,9 @@ steps: # Pin openjdk version << parameters.openjdk_version >> brew install openjdk@${OJDK_VERSION} sudo ln -sfn /usr/local/opt/openjdk@${OJDK_VERSION}/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-${OJDK_VERSION}.jdk - echo "export PATH=\"/usr/local/opt/openjdk@${OJDK_VERSION}/bin:$PATH\"" >> $BASH_ENV - echo "export CPPFLAGS=\"-I/usr/local/opt/openjdk@${OJDK_VERSION}/include\"" >> $BASH_ENV + echo 'export PATH="/usr/local/opt/openjdk@${OJDK_VERSION}/bin:$PATH"' >> "$HOME/.bash_profile" + export CPPFLAGS="-I/usr/local/opt/openjdk@${OJDK_VERSION}/include" + source "$HOME/.bash_profile" # Install sbt without overriding openjdk brew install --ignore-dependencies sbt - run: From b803f92ab62d81a77733c53e3e40e8759e30b5f8 Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Tue, 24 Feb 2026 16:30:00 +0100 Subject: [PATCH 4/5] . --- src/jobs/sbt_osx.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/jobs/sbt_osx.yml b/src/jobs/sbt_osx.yml index 576891cf..501b3f31 100644 --- a/src/jobs/sbt_osx.yml +++ b/src/jobs/sbt_osx.yml @@ -56,14 +56,13 @@ steps: - run: name: Download and install sbt environment: - OJDK_VERSION: << parameters.openjdk_version >> HOMEBREW_NO_AUTO_UPDATE: 1 command: | # Pin openjdk version << parameters.openjdk_version >> - brew install openjdk@${OJDK_VERSION} - sudo ln -sfn /usr/local/opt/openjdk@${OJDK_VERSION}/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-${OJDK_VERSION}.jdk - echo 'export PATH="/usr/local/opt/openjdk@${OJDK_VERSION}/bin:$PATH"' >> "$HOME/.bash_profile" - export CPPFLAGS="-I/usr/local/opt/openjdk@${OJDK_VERSION}/include" + brew install openjdk@<< parameters.openjdk_version >> + sudo ln -sfn /usr/local/opt/openjdk@<< parameters.openjdk_version >>/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-<< parameters.openjdk_version >>.jdk + echo 'export PATH="/usr/local/opt/openjdk@<< parameters.openjdk_version >>/bin:$PATH"' >> "$HOME/.bash_profile" + export CPPFLAGS="-I/usr/local/opt/openjdk@<< parameters.openjdk_version >>/include" source "$HOME/.bash_profile" # Install sbt without overriding openjdk brew install --ignore-dependencies sbt From b1f562e647a2601e7452e99eb63f0e6a0ba0fcd0 Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Tue, 24 Feb 2026 16:40:55 +0100 Subject: [PATCH 5/5] . --- src/jobs/sbt_osx.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jobs/sbt_osx.yml b/src/jobs/sbt_osx.yml index 501b3f31..ae12ad1e 100644 --- a/src/jobs/sbt_osx.yml +++ b/src/jobs/sbt_osx.yml @@ -60,9 +60,9 @@ steps: command: | # Pin openjdk version << parameters.openjdk_version >> brew install openjdk@<< parameters.openjdk_version >> - sudo ln -sfn /usr/local/opt/openjdk@<< parameters.openjdk_version >>/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-<< parameters.openjdk_version >>.jdk - echo 'export PATH="/usr/local/opt/openjdk@<< parameters.openjdk_version >>/bin:$PATH"' >> "$HOME/.bash_profile" - export CPPFLAGS="-I/usr/local/opt/openjdk@<< parameters.openjdk_version >>/include" + sudo ln -sfn /opt/homebrew/opt/opt/openjdk@<< parameters.openjdk_version >>/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-<< parameters.openjdk_version >>.jdk + echo 'export PATH="/opt/homebrew/opt/openjdk@<< parameters.openjdk_version >>/bin:$PATH"' >> "$HOME/.bash_profile" + export CPPFLAGS="-I/opt/homebrew/opt/openjdk@<< parameters.openjdk_version >>/include" source "$HOME/.bash_profile" # Install sbt without overriding openjdk brew install --ignore-dependencies sbt