Skip to content

Commit 02147fa

Browse files
author
Andrea Scuderi
committed
Fix tests
1 parent a01ee49 commit 02147fa

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

.github/workflows/swift-test.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ jobs:
1111
swift-tests:
1212
name: 'Swift Tests'
1313
runs-on: ubuntu-latest
14-
container: swift:5.10-jammy
15-
1614
# Use the Bash shell regardless whether the GitHub Actions runner is ubuntu-latest, macos-latest, or windows-latest
1715
defaults:
1816
run:
@@ -23,8 +21,15 @@ jobs:
2321
- name: Checkout
2422
uses: actions/checkout@v3
2523

26-
# Run tests with Thread Sanitizer https://www.swift.org/blog/tsan-support-on-linux/
27-
- name: Run tests with Thread Sanitizer
24+
# Set up Swift
25+
- uses: swift-actions/setup-swift@v2
26+
with:
27+
swift-version: "5.10"
28+
- name: Get swift version
29+
run: swift --version
30+
31+
# Run tests
32+
- name: Run tests
2833
run: swift test
2934
- name: Coverage
3035
run: |

Makefile

+11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1+
SWIFT_DOCKER_IMAGE = swift:5.10-jammy
2+
MOUNT_ROOT=$(shell pwd)
13
SWIFT_BIN_PATH = $(shell swift build --show-bin-path)
24
TEST_PACKAGE= $(SWIFT_BIN_PATH)/SwiftSlsAdapterTestsPackageTests.xctest
35
BUILD_TEMP = .build/temp
46

7+
docker_bash:
8+
docker run \
9+
-it \
10+
--rm \
11+
--volume "$(MOUNT_ROOT):/src" \
12+
--workdir "/src/" \
13+
$(SWIFT_DOCKER_IMAGE) \
14+
/bin/bash
15+
516
coverage:
617
llvm-cov export $(TEST_PACKAGE) \
718
--instr-profile=$(SWIFT_BIN_PATH)/codecov/default.profdata \

0 commit comments

Comments
 (0)