Skip to content

Commit d81cd16

Browse files
stephencelisstephencelis
authored
Git-ignore .swiftpm/ directory (#54)
* Git-ignore .swiftpm/ directory * Update ci.yml * Update ci.yml * Update ci.yml * Update ci.yml * Update Makefile * Update Makefile * Update Makefile * wip * wip * Update ci.yml * Update ci.yml * fix
1 parent 11ccf4c commit d81cd16

File tree

10 files changed

+75
-143
lines changed

10 files changed

+75
-143
lines changed

‎.github/workflows/ci.yml

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,18 @@ on:
1111

1212
jobs:
1313
macos:
14-
name: MacOS (Xcode ${{ matrix.xcode }}${{ matrix.experimental-build-system && ', experimental build system' || '' }})
15-
runs-on: macOS-11.0
14+
name: macOS (Xcode ${{ matrix.xcode }})
15+
runs-on: macOS-12
1616
strategy:
1717
matrix:
1818
xcode:
19-
- '12.4'
20-
- '12.5.1'
21-
- '13.0'
22-
- '13.1'
23-
- '13.2.1'
24-
experimental-build-system: [false]
25-
include:
26-
- xcode: '13.2.1'
27-
experimental-build-system: true
19+
- '13.3.1'
20+
- '13.4.1'
21+
- '14.0'
2822
steps:
2923
- uses: actions/checkout@v2
3024
- name: Select Xcode ${{ matrix.xcode }}
3125
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
32-
- name: Enable Experimental Build System
33-
if: ${{ matrix.experimental-build-system }}
34-
run: defaults write com.apple.dt.XCBuild EnableSwiftBuildSystemIntegration 1
3526
- name: Print Swift version
3627
run: swift --version
3728
- name: Run tests (Swift)
@@ -53,20 +44,14 @@ jobs:
5344
- name: Run tests
5445
run: make test-linux SWIFT_VERSION=${{ matrix.swift }}
5546

56-
windows:
57-
name: Windows
58-
runs-on: windows-latest
59-
strategy:
60-
matrix:
61-
swift:
62-
#- 5.3
63-
- 5.4
64-
- 5.5
65-
timeout-minutes: 30
66-
steps:
67-
- uses: actions/checkout@v2
68-
- name: Install Swift & Run tests
69-
uses: MaxDesiatov/swift-windows-action@v1
70-
with:
71-
shell-action: swift test && swift build --configuration release
72-
swift-version: ${{ matrix.swift }}
47+
#windows:
48+
# name: Windows
49+
# runs-on: windows-latest
50+
# steps:
51+
# - uses: compnerd/gha-setup-swift@main
52+
# with:
53+
# branch: swift-5.5-release
54+
# tag: 5.5-RELEASE
55+
#
56+
# - uses: actions/checkout@v2
57+
# - run: swift test && swift build --configuration release

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
/.build
3+
/.swiftpm
34
/Packages
45
/*.xcodeproj
56
xcuserdata/

‎.spi.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.swiftpm/xcode/xcshareddata/xcschemes/swift-custom-dump.xcscheme

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎CustomDump.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist renamed to ‎CustomDump.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

File renamed without changes.

‎CustomDump.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.swiftpm/xcode/xcshareddata/xcschemes/CustomDump_watchOS.xcscheme renamed to ‎CustomDump.xcworkspace/xcshareddata/xcschemes/CustomDump.xcscheme

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1400"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -28,6 +28,16 @@
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "CustomDumpTests"
36+
BuildableName = "CustomDumpTests"
37+
BlueprintName = "CustomDumpTests"
38+
ReferencedContainer = "container:">
39+
</BuildableReference>
40+
</TestableReference>
3141
</Testables>
3242
</TestAction>
3343
<LaunchAction

‎Makefile

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
PLATFORM_IOS = iOS Simulator,name=iPhone 11 Pro Max
22
PLATFORM_MACOS = macOS
33
PLATFORM_MAC_CATALYST = macOS,variant=Mac Catalyst
4-
PLATFORM_TVOS = tvOS Simulator,name=Apple TV 4K (at 1080p)
5-
PLATFORM_WATCHOS = watchOS Simulator,name=Apple Watch Series 4 - 44mm
4+
PLATFORM_TVOS = tvOS Simulator,name=Apple TV
65
SWIFT_VERSION = 5.5
76
ifeq ($(SWIFT_VERSION),5.3)
87
SWIFT_BUILD_ARGS = --enable-test-discovery
@@ -25,44 +24,54 @@ test-swift:
2524

2625
test-platforms:
2726
xcodebuild test \
28-
-scheme swift-custom-dump \
27+
-workspace CustomDump.xcworkspace \
28+
-scheme CustomDump \
2929
-destination platform="$(PLATFORM_IOS)"
3030
xcodebuild \
31-
-scheme swift-custom-dump \
31+
-workspace CustomDump.xcworkspace \
32+
-scheme CustomDump \
3233
-configuration Release \
3334
-destination platform="$(PLATFORM_IOS)"
3435

3536
xcodebuild test \
36-
-scheme swift-custom-dump \
37+
-workspace CustomDump.xcworkspace \
38+
-scheme CustomDump \
3739
-destination platform="$(PLATFORM_MACOS)"
3840
xcodebuild \
39-
-scheme swift-custom-dump \
41+
-workspace CustomDump.xcworkspace \
42+
-scheme CustomDump \
4043
-configuration Release \
4144
-destination platform="$(PLATFORM_MACOS)"
4245

4346
xcodebuild test \
44-
-scheme swift-custom-dump \
47+
-workspace CustomDump.xcworkspace \
48+
-scheme CustomDump \
4549
-destination platform="$(PLATFORM_MAC_CATALYST)"
4650
xcodebuild \
47-
-scheme swift-custom-dump \
51+
-workspace CustomDump.xcworkspace \
52+
-scheme CustomDump \
4853
-configuration Release \
4954
-destination platform="$(PLATFORM_MAC_CATALYST)"
5055

5156
xcodebuild test \
52-
-scheme swift-custom-dump \
57+
-workspace CustomDump.xcworkspace \
58+
-scheme CustomDump \
5359
-destination platform="$(PLATFORM_TVOS)"
5460
xcodebuild \
55-
-scheme swift-custom-dump \
61+
-workspace CustomDump.xcworkspace \
62+
-scheme CustomDump \
5663
-configuration Release \
5764
-destination platform="$(PLATFORM_TVOS)"
5865

5966
xcodebuild \
60-
-scheme CustomDump_watchOS \
61-
-destination platform="$(PLATFORM_WATCHOS)"
67+
-workspace CustomDump.xcworkspace \
68+
-scheme CustomDump \
69+
-destination generic/platform=watchOS
6270
xcodebuild \
63-
-scheme CustomDump_watchOS \
71+
-workspace CustomDump.xcworkspace \
72+
-scheme CustomDump \
6473
-configuration Release \
65-
-destination platform="$(PLATFORM_WATCHOS)"
74+
-destination generic/platform=watchOS
6675

6776
format:
6877
swift format --in-place --recursive .

‎Tests/CustomDumpTests/Conformances/UIKitTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if canImport(UIKit)
1+
#if canImport(UIKit) && !os(watchOS)
22
import CustomDump
33
import XCTest
44
import UIKit

0 commit comments

Comments
 (0)