Skip to content

Commit ad7f5ab

Browse files
committed
macOS fix
1 parent 706a4ba commit ad7f5ab

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

.semaphore/semaphore.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ blocks:
4141
- name: 'Build and test'
4242
commands:
4343
- ulimit -n 1024
44-
- brew install dotnet-sdk
44+
- sudo chown -R "$(whoami)" "$(brew --caskroom)"
45+
- brew install --appdir=~/Applications dotnet-sdk
4546
- dotnet restore -p:TargetFramework=net8.0
4647
- make build
4748
- make test
@@ -159,5 +160,5 @@ blocks:
159160
- cd test/docker && docker-compose up -d && cd ../..
160161
- export SEMAPHORE_SKIP_FLAKY_TESTS='true'
161162
- dotnet restore -p:TargetFramework=net8.0
162-
- cd test/Confluent.SchemaRegistry.Serdes.IntegrationTests && dotnet test -f net8.0 -l "console;verbosity=normal" && cd ../..
163-
# - cd test/Confluent.SchemaRegistry.IntegrationTests && dotnet test -l "console;verbosity=normal" && cd ../..
163+
- cd test/Confluent.SchemaRegistry.Serdes.IntegrationTests && dotnet test -f net8.0 -l "console;verbosity=normal" && cd ../..
164+
- cd test/Confluent.SchemaRegistry.IntegrationTests && dotnet test -f net8.0 -l "console;verbosity=normal" && cd ../..

Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ EXAMPLE_DIRS=$(shell find ./examples -name '*.csproj' -exec dirname {} \;)
1010
TEST_DIRS=$(shell find ./test -name '*.csproj' \;)
1111
UNIT_TEST_DIRS=$(shell find . -type d -regex '.*UnitTests$$' -exec basename {} \;)
1212

13-
DEFAULT_FRAMEWORK?=net8.0
13+
# We want examples to be able to execute with oldest supported .NET version
14+
DEFAULT_EXAMPLE_FRAMEWORK?=net6.0
15+
# We want to run tests by default with latest version of .NET
16+
DEFAULT_TEST_FRAMEWORK?=net8.0
1417

1518
all:
1619
@echo "Usage: make <dotnet-command>"
@@ -19,10 +22,10 @@ all:
1922
.PHONY: test
2023

2124
build:
22-
for d in $(EXAMPLE_DIRS) ; do dotnet $@ -f $(DEFAULT_FRAMEWORK) $$d; done ; \
23-
for d in $(TEST_DIRS) ; do dotnet $@ -f $(DEFAULT_FRAMEWORK) $$d; done ;
25+
for d in $(EXAMPLE_DIRS) ; do dotnet $@ -f $(DEFAULT_EXAMPLE_FRAMEWORK) $$d; done ; \
26+
for d in $(TEST_DIRS) ; do dotnet $@ -f $(DEFAULT_TEST_FRAMEWORK) $$d; done ;
2427

2528
test:
2629
@(for d in $(UNIT_TEST_DIRS) ; do \
27-
dotnet test -f $(DEFAULT_FRAMEWORK) test/$$d/$$d.csproj ; \
30+
dotnet test -f $(DEFAULT_TEST_FRAMEWORK) test/$$d/$$d.csproj ; \
2831
done)

0 commit comments

Comments
 (0)