Skip to content

Commit 8a20ed2

Browse files
authored
Replace clone-swift.sh with git submodule for Swift headers (#217)
1 parent 6c04001 commit 8a20ed2

16 files changed

Lines changed: 28 additions & 197 deletions

File tree

‎.github/actions/checkout-swift-headers/action.yml‎

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

‎.github/workflows/compatibility_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ jobs:
2525
GH_TOKEN: ${{ github.token }}
2626
steps:
2727
- uses: actions/checkout@v4
28+
with:
29+
submodules: true
2830
- name: Setup Xcode
2931
uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
3032
with:
3133
xcode-version: ${{ matrix.xcode-version }}
3234
- name: Set up build environment
3335
run: Scripts/CI/darwin_setup_build.sh
3436
shell: bash
35-
- name: Checkout Swift headers
36-
uses: ./.github/actions/checkout-swift-headers
3737
- name: Run tests against Apple's AttributeGraph on macOS via SwiftPM
3838
run: |
3939
swift test \

‎.github/workflows/compute.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
container: swift:${{ matrix.swift_version }}-jammy
2323
steps:
2424
- uses: actions/checkout@v4
25+
with:
26+
submodules: true
2527
- name: Set up Linux build environment
2628
run: Scripts/CI/linux_compute_build.sh
2729
shell: bash
28-
- name: Checkout Swift headers
29-
uses: ./.github/actions/checkout-swift-headers
3030
- name: Build in debug mode
3131
run: swift build -c debug -Xcc -Wno-elaborated-enum-base
3232

@@ -44,12 +44,12 @@ jobs:
4444
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY: 1
4545
steps:
4646
- uses: actions/checkout@v4
47+
with:
48+
submodules: true
4749
- name: Setup Xcode
4850
uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
4951
with:
5052
xcode-version: ${{ matrix.xcode-version }}
51-
- name: Checkout Swift headers
52-
uses: ./.github/actions/checkout-swift-headers
5353
- name: Build in debug mode
5454
run: swift build -c debug
5555

@@ -71,12 +71,12 @@ jobs:
7171
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY: 1
7272
steps:
7373
- uses: actions/checkout@v4
74+
with:
75+
submodules: true
7476
- name: Setup Xcode
7577
uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
7678
with:
7779
xcode-version: ${{ matrix.xcode-version }}
78-
- name: Checkout Swift headers
79-
uses: ./.github/actions/checkout-swift-headers
8080
- name: Build in debug mode on iOS Simulator
8181
run: |
8282
xcodebuild build \

‎.github/workflows/ios.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727
GH_TOKEN: ${{ github.token }}
2828
steps:
2929
- uses: actions/checkout@v4
30+
with:
31+
submodules: true
3032
- name: Setup Xcode
3133
uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
3234
with:
3335
xcode-version: ${{ matrix.xcode-version }}
3436
- name: Set up build environment
3537
run: Scripts/CI/darwin_setup_build.sh
3638
shell: bash
37-
- name: Checkout Swift headers
38-
uses: ./.github/actions/checkout-swift-headers
3939
- name: Build in debug mode on iOS
4040
run: |
4141
xcodebuild build \

‎.github/workflows/macos.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ jobs:
2323
GH_TOKEN: ${{ github.token }}
2424
steps:
2525
- uses: actions/checkout@v4
26+
with:
27+
submodules: true
2628
- name: Setup Xcode
2729
uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
2830
with:
2931
xcode-version: ${{ matrix.xcode-version }}
3032
- name: Set up build environment
3133
run: Scripts/CI/darwin_setup_build.sh
3234
shell: bash
33-
- name: Checkout Swift headers
34-
uses: ./.github/actions/checkout-swift-headers
3535
- name: Build and run tests in debug mode with coverage
3636
run: |
3737
swift test \

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ jobs:
1717
- uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
20+
submodules: true
2021
- name: Setup Xcode
2122
uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
2223
with:
2324
xcode-version: "16.4"
24-
- name: Checkout Swift headers
25-
uses: ./.github/actions/checkout-swift-headers
2625
- name: Build XCFramework
2726
run: ./Scripts/build_xcframework.sh
2827
- name: Compute Checksum

‎.github/workflows/ubuntu.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
container: swift:${{ matrix.swift_version }}-jammy
2020
steps:
2121
- uses: actions/checkout@v4
22-
- name: Checkout Swift headers
23-
uses: ./.github/actions/checkout-swift-headers
22+
with:
23+
submodules: true
2424
- name: Building and running tests in debug mode with coverage
2525
run: |
2626
swift test \

‎.github/workflows/xcframework.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
GH_TOKEN: ${{ github.token }}
2020
steps:
2121
- uses: actions/checkout@v4
22+
with:
23+
submodules: true
2224
- name: Setup Xcode
2325
uses: OpenSwiftUIProject/OpenSwiftUI/.github/actions/setup-xcode@main
2426
with:
2527
xcode-version: ${{ matrix.xcode-version }}
26-
- name: Checkout Swift headers
27-
uses: ./.github/actions/checkout-swift-headers
2828
- name: Build XCFramework
2929
run: ./Scripts/build_xcframework.sh
3030
- name: Upload XCFramework

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ DerivedData/
88
.netrc
99
coverage.txt
1010
TODO.md
11-
Checkouts/
11+
Checkouts/*
12+
!Checkouts/swift
1213
.ag_template/
1314
build/
1415
.ag_repo/

‎.gitmodules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "Checkouts/swift"]
2+
path = Checkouts/swift
3+
url = https://github.com/OpenSwiftUIProject/swift-runtime-headers.git
4+
branch = release/6.1

0 commit comments

Comments
 (0)