CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: Update to Xcode 15 in CI (#15389)

This commit is contained in:
Dane Strandboge 2024-05-24 02:37:15 -05:00 committed by GitHub
parent 4aa288b25f
commit 66766da8b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.circleci/config.yml
View File

@ -15,7 +15,7 @@ executors:
working_directory: '~/go/src/github.com/influxdata/telegraf' working_directory: '~/go/src/github.com/influxdata/telegraf'
resource_class: macos.m1.medium.gen1 resource_class: macos.m1.medium.gen1
macos: macos:
xcode: 14.2.0 xcode: 15.4.0
environment: environment:
HOMEBREW_NO_AUTO_UPDATE: 1 HOMEBREW_NO_AUTO_UPDATE: 1
GOFLAGS: -p=4 GOFLAGS: -p=4
@ -47,6 +47,11 @@ commands:
equal: [ windows, << parameters.os >> ] equal: [ windows, << parameters.os >> ]
steps: steps:
- run: echo 'export CGO_ENABLED=1' >> $BASH_ENV - run: echo 'export CGO_ENABLED=1' >> $BASH_ENV
- when:
condition:
equal: [ darwin, << parameters.os >> ]
steps:
- run: echo 'export RACE="$RACE -ldflags=-extldflags=-Wl,-ld_classic"' >> $BASH_ENV
- run: | - run: |
GOARCH=<< parameters.arch >> ./<< parameters.gotestsum >> -- ${RACE} -short ./... GOARCH=<< parameters.arch >> ./<< parameters.gotestsum >> -- ${RACE} -short ./...
package-build: package-build:

8
Makefile
View File

@ -55,7 +55,13 @@ endif
# Go built-in race detector works only for 64 bits architectures. # Go built-in race detector works only for 64 bits architectures.
ifneq ($(GOARCH), 386) ifneq ($(GOARCH), 386)
race_detector := -race # Resolve macOS issue with Xcode 15 when running in race detector mode
# https://github.com/golang/go/issues/61229
ifeq ($(GOOS), darwin)
race_detector := -race -ldflags=-extldflags=-Wl,-ld_classic
else
race_detector := -race
endif
endif endif