Skip to content

Commit cffdb90

Browse files
authored
Fix CI xcode_install_go script (#498)
* Update xcode version * Fix Xcode_install_go script
1 parent 2cd3a82 commit cffdb90

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ linux_image: &linux_image
99

1010
macos_image: &macos_image
1111
macos:
12-
xcode: "11.4.0"
12+
xcode: "11.7.0"
1313

1414
setup_macos_env: &setup_macos_env
1515

.circleci/xcode_install_go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@ set -o errexit
99
set -o pipefail
1010

1111
PROJECT_RELATIVE_PATH=src/github.com/codeclimate/test-reporter
12-
13-
# Install go
12+
13+
# Install goSDK
14+
mkdir ~/gosdk && cd "$_"
15+
echo 'export PATH=$PATH:$HOME/gosdk/go/bin' >> "$BASH_ENV"
16+
echo 'export GOROOT=$HOME/gosdk/go' >> "$BASH_ENV"
1417
curl -O https://dl.google.com/go/go1.15.darwin-amd64.tar.gz
1518
tar -xzf go1.15.darwin-amd64.tar.gz
16-
echo 'export PATH=$PATH:$PWD/go/bin' >> "$BASH_ENV"
1719

18-
# Set go path
19-
mkdir -p ~/gopath/${PROJECT_RELATIVE_PATH}
20-
echo 'export GOPATH=$HOME/gopath' >> "$BASH_ENV"
20+
# Set go path - workspace root
21+
mkdir -p ~/projects/go/${PROJECT_RELATIVE_PATH} && cd "$_"
22+
echo 'export GOPATH=$HOME/projects/go' >> "$BASH_ENV"
2123
. "$BASH_ENV"
22-
cd $GOPATH/${PROJECT_RELATIVE_PATH}
2324
cp -r ~/project/ $GOPATH/${PROJECT_RELATIVE_PATH}

0 commit comments

Comments
 (0)