Skip to content

Commit 4a30ea5

Browse files
authored
bump: Update macos image (#240)
1 parent 0620208 commit 4a30ea5

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/executors/osx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ description: >
33
https://circleci.com/docs/2.0/configuration-reference/#macos
44
55
macos:
6-
xcode: "13.4.1"
6+
xcode: "26.3.0"
77

88
working_directory: ~/workdir

src/jobs/sbt_osx.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ steps:
5656
- run:
5757
name: Download and install sbt
5858
environment:
59-
OJDK_VERSION: << parameters.openjdk_version >>
6059
HOMEBREW_NO_AUTO_UPDATE: 1
6160
command: |
6261
# Pin openjdk version << parameters.openjdk_version >>
63-
brew install openjdk@${OJDK_VERSION}
64-
sudo ln -sfn /usr/local/opt/openjdk@${OJDK_VERSION}/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-${OJDK_VERSION}.jdk
65-
echo 'export PATH="/usr/local/opt/openjdk@${OJDK_VERSION}/bin:$PATH"' >> /Users/distiller/.bash_profile
66-
export CPPFLAGS="-I/usr/local/opt/openjdk@${OJDK_VERSION}/include"
62+
brew install openjdk@<< parameters.openjdk_version >>
63+
sudo ln -sfn /opt/homebrew/opt/opt/openjdk@<< parameters.openjdk_version >>/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-<< parameters.openjdk_version >>.jdk
64+
echo 'export PATH="/opt/homebrew/opt/openjdk@<< parameters.openjdk_version >>/bin:$PATH"' >> "$HOME/.bash_profile"
65+
export CPPFLAGS="-I/opt/homebrew/opt/openjdk@<< parameters.openjdk_version >>/include"
66+
source "$HOME/.bash_profile"
6767
# Install sbt without overriding openjdk
6868
brew install --ignore-dependencies sbt
6969
- run:

0 commit comments

Comments
 (0)