Skip to content

Commit 7877791

Browse files
Kyle-YeKyle-Ye
authored
Revert "Enable Tuist caching and build insights in CI" (#231)
1 parent eb494fb commit 7877791

13 files changed

Lines changed: 37 additions & 153 deletions

File tree

‎.github/workflows/compatibility_tests.yml‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ on:
99
jobs:
1010
compatibility_tests_macos:
1111
name: Execute compatibility tests
12-
permissions:
13-
contents: read
14-
id-token: write
1512
strategy:
1613
fail-fast: false
1714
matrix:
@@ -34,18 +31,6 @@ jobs:
3431
uses: OpenSwiftUIProject/setup-xcode@v2
3532
with:
3633
xcode-version: ${{ matrix.xcode-version }}
37-
- name: Set up mise
38-
uses: jdx/mise-action@v2
39-
with:
40-
install: false
41-
cache: false
42-
- name: Set up Tuist cache
43-
run: |
44-
mise trust mise.toml
45-
mise install
46-
mise exec -- tuist auth login
47-
mise exec -- tuist setup cache
48-
shell: bash
4934
- name: Set up build environment
5035
run: Scripts/CI/darwin_setup_build.sh
5136
shell: bash
@@ -57,18 +42,10 @@ jobs:
5742
--build-path .build-compatibility-test-debug
5843
- name: Run tests against Apple's AttributeGraph on macOS via Xcode
5944
run: |
60-
result_bundle="${RUNNER_TEMP:-/tmp}/openattributegraph-compatibility-macos-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT:-0}.xcresult"
61-
rm -rf "$result_bundle"
62-
trap 'rm -rf "$result_bundle"' EXIT
63-
mise exec -- tuist xcodebuild test \
45+
xcodebuild test \
6446
-workspace .swiftpm/xcode/package.xcworkspace \
6547
-scheme OpenAttributeGraph-Package \
6648
-sdk macosx \
6749
-destination "platform=macOS" \
68-
-resultBundlePath "$result_bundle" \
6950
-skipPackagePluginValidation \
70-
-skipMacroValidation \
71-
COMPILATION_CACHE_ENABLE_CACHING=YES \
72-
COMPILATION_CACHE_REMOTE_SERVICE_PATH="$HOME/.local/state/tuist/OpenSwiftUIProject_openattributegraph.sock" \
73-
COMPILATION_CACHE_ENABLE_PLUGIN=YES \
74-
COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS=YES
51+
-skipMacroValidation

‎.github/workflows/compute.yml‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ jobs:
5757

5858
compute_ios_build:
5959
name: Build with Compute (binary) on iOS
60-
permissions:
61-
contents: read
62-
id-token: write
6360
strategy:
6461
fail-fast: false
6562
matrix:
@@ -82,34 +79,14 @@ jobs:
8279
uses: OpenSwiftUIProject/setup-xcode@v2
8380
with:
8481
xcode-version: ${{ matrix.xcode-version }}
85-
- name: Set up mise
86-
uses: jdx/mise-action@v2
87-
with:
88-
install: false
89-
cache: false
90-
- name: Set up Tuist cache
91-
run: |
92-
mise trust mise.toml
93-
mise install
94-
mise exec -- tuist auth login
95-
mise exec -- tuist setup cache
96-
shell: bash
9782
- name: Build in debug mode on iOS Simulator
9883
run: |
99-
result_bundle="${RUNNER_TEMP:-/tmp}/openattributegraph-compute-ios-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT:-0}.xcresult"
100-
rm -rf "$result_bundle"
101-
trap 'rm -rf "$result_bundle"' EXIT
102-
mise exec -- tuist xcodebuild build \
84+
xcodebuild build \
10385
-workspace .swiftpm/xcode/package.xcworkspace \
10486
-scheme OpenAttributeGraph \
10587
-configuration Debug \
10688
-destination "platform=iOS Simulator,OS=${{ matrix.ios-version }},name=${{ matrix.ios-simulator-name }}" \
10789
-derivedDataPath .build-debug \
108-
-resultBundlePath "$result_bundle" \
10990
-skipMacroValidation \
11091
-skipPackagePluginValidation \
111-
OTHER_SWIFT_FLAGS="-warnings-as-errors" \
112-
COMPILATION_CACHE_ENABLE_CACHING=YES \
113-
COMPILATION_CACHE_REMOTE_SERVICE_PATH="$HOME/.local/state/tuist/OpenSwiftUIProject_openattributegraph.sock" \
114-
COMPILATION_CACHE_ENABLE_PLUGIN=YES \
115-
COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS=YES
92+
OTHER_SWIFT_FLAGS="-warnings-as-errors"

‎.github/workflows/ios.yml‎

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ on:
99
jobs:
1010
ios_test:
1111
name: Execute tests on iOS
12-
permissions:
13-
contents: read
14-
id-token: write
1512
strategy:
1613
fail-fast: false
1714
matrix:
@@ -36,63 +33,35 @@ jobs:
3633
uses: OpenSwiftUIProject/setup-xcode@v2
3734
with:
3835
xcode-version: ${{ matrix.xcode-version }}
39-
- name: Set up mise
40-
uses: jdx/mise-action@v2
41-
with:
42-
install: false
43-
cache: false
44-
- name: Set up Tuist cache
45-
run: |
46-
mise trust mise.toml
47-
mise install
48-
mise exec -- tuist auth login
49-
mise exec -- tuist setup cache
50-
shell: bash
5136
- name: Set up build environment
5237
run: Scripts/CI/darwin_setup_build.sh
5338
shell: bash
5439
- name: Build in debug mode on iOS
5540
run: |
56-
result_bundle="${RUNNER_TEMP:-/tmp}/openattributegraph-ios-build-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT:-0}.xcresult"
57-
rm -rf "$result_bundle"
58-
trap 'rm -rf "$result_bundle"' EXIT
5941
# Swift 6.2.4 crashes while indexing C++ interop test targets.
60-
mise exec -- tuist xcodebuild build \
42+
xcodebuild build \
6143
-workspace .swiftpm/xcode/package.xcworkspace \
6244
-scheme OpenAttributeGraph-Package \
6345
-configuration Debug \
6446
-destination "platform=iOS Simulator,OS=${{ matrix.ios-version }},name=${{ matrix.ios-simulator-name }}" \
6547
-derivedDataPath .build-debug \
66-
-resultBundlePath "$result_bundle" \
6748
-skipMacroValidation \
6849
-skipPackagePluginValidation \
6950
COMPILER_INDEX_STORE_ENABLE=NO \
70-
OTHER_SWIFT_FLAGS="-warnings-as-errors" \
71-
COMPILATION_CACHE_ENABLE_CACHING=YES \
72-
COMPILATION_CACHE_REMOTE_SERVICE_PATH="$HOME/.local/state/tuist/OpenSwiftUIProject_openattributegraph.sock" \
73-
COMPILATION_CACHE_ENABLE_PLUGIN=YES \
74-
COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS=YES
51+
OTHER_SWIFT_FLAGS="-warnings-as-errors"
7552
- name: Build and run tests in debug mode with coverage on iOS Simulator
7653
run: |
77-
result_bundle="${RUNNER_TEMP:-/tmp}/openattributegraph-ios-test-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT:-0}.xcresult"
78-
rm -rf "$result_bundle"
79-
trap 'rm -rf "$result_bundle"' EXIT
8054
# Swift 6.2.4 crashes while indexing C++ interop test targets.
81-
mise exec -- tuist xcodebuild test \
55+
xcodebuild test \
8256
-workspace .swiftpm/xcode/package.xcworkspace \
8357
-scheme OpenAttributeGraph-Package \
8458
-configuration Debug \
8559
-destination "platform=iOS Simulator,OS=${{ matrix.ios-version }},name=${{ matrix.ios-simulator-name }}" \
8660
-enableCodeCoverage=YES \
8761
-derivedDataPath .build-test-debug \
88-
-resultBundlePath "$result_bundle" \
8962
-skipPackagePluginValidation \
9063
-skipMacroValidation \
91-
COMPILER_INDEX_STORE_ENABLE=NO \
92-
COMPILATION_CACHE_ENABLE_CACHING=YES \
93-
COMPILATION_CACHE_REMOTE_SERVICE_PATH="$HOME/.local/state/tuist/OpenSwiftUIProject_openattributegraph.sock" \
94-
COMPILATION_CACHE_ENABLE_PLUGIN=YES \
95-
COMPILATION_CACHE_ENABLE_DIAGNOSTIC_REMARKS=YES
64+
COMPILER_INDEX_STORE_ENABLE=NO
9665
# OTHER_SWIFT_FLAGS="-warnings-as-errors" Conflicting options '-warnings-as-errors' and '-suppress-warnings'
9766
- name: Generate iOS coverage report
9867
run: |

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ jobs:
1111
runs-on: macos-15
1212
permissions:
1313
contents: write
14-
id-token: write
1514
env:
1615
GH_TOKEN: ${{ github.token }}
1716
steps:
@@ -23,31 +22,17 @@ jobs:
2322
uses: OpenSwiftUIProject/setup-xcode@v2
2423
with:
2524
xcode-version: "26.3"
26-
- name: Set up mise
27-
uses: jdx/mise-action@v2
28-
with:
29-
install: false
30-
cache: false
31-
- name: Set up Tuist cache
32-
run: |
33-
mise trust mise.toml
34-
mise install
35-
mise exec -- tuist auth login
36-
mise exec -- tuist setup cache
37-
shell: bash
3825
- name: Build XCFramework
3926
run: ./Scripts/build_xcframework.sh
4027
- name: Compute Checksum
4128
id: checksum
4229
run: |
43-
echo "checksum=$(swift package compute-checksum .build/Xcode/Frameworks/OpenAttributeGraph.xcframework.zip)" >> "$GITHUB_OUTPUT"
30+
echo "checksum=$(swift package compute-checksum .build/Xcode/Frameworks/OpenAttributeGraph.xcframework.zip)" >> $GITHUB_OUTPUT
4431
- name: Collect Build Info
4532
id: build_info
4633
run: |
47-
{
48-
echo "xcode_version=$(xcodebuild -version | head -1)"
49-
echo "swift_version=$(swift --version 2>&1 | head -1)"
50-
} >> "$GITHUB_OUTPUT"
34+
echo "xcode_version=$(xcodebuild -version | head -1)" >> $GITHUB_OUTPUT
35+
echo "swift_version=$(swift --version 2>&1 | head -1)" >> $GITHUB_OUTPUT
5136
- name: Generate Release Notes
5237
run: |
5338
TAG_NAME="${GITHUB_REF#refs/tags/}"

‎.github/workflows/xcframework.yml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ on:
99
jobs:
1010
build_xcframework:
1111
name: Build XCFramework
12-
permissions:
13-
contents: read
14-
id-token: write
1512
strategy:
1613
fail-fast: false
1714
matrix:
@@ -28,18 +25,6 @@ jobs:
2825
uses: OpenSwiftUIProject/setup-xcode@v2
2926
with:
3027
xcode-version: ${{ matrix.xcode-version }}
31-
- name: Set up mise
32-
uses: jdx/mise-action@v2
33-
with:
34-
install: false
35-
cache: false
36-
- name: Set up Tuist cache
37-
run: |
38-
mise trust mise.toml
39-
mise install
40-
mise exec -- tuist auth login
41-
mise exec -- tuist setup cache
42-
shell: bash
4328
- name: Build XCFramework
4429
run: ./Scripts/build_xcframework.sh
4530
- name: Upload XCFramework

‎Example/Project.swift‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ let indexStoreDisabledSettings: SettingsDictionary = [
77

88
let project = Project(
99
name: "Example",
10-
packages: [
11-
.package(path: ".."),
12-
],
1310
settings: .settings(base: indexStoreDisabledSettings),
1411
targets: [
1512
.target(
@@ -21,7 +18,7 @@ let project = Project(
2118
sources: ["Sources/**"],
2219
dependencies: [
2320
.sdk(name: "c++", type: .library),
24-
.package(product: "OpenAttributeGraph"),
21+
.external(name: "OpenAttributeGraph"),
2522
],
2623
settings: .settings(base: indexStoreDisabledSettings)
2724
),

‎Example/Tuist.swift‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
import ProjectDescription
22

33
let tuist = Tuist(
4-
fullHandle: "OpenSwiftUIProject/openattributegraph",
5-
xcodeCache: .xcodeCache(
6-
upload: Environment.isCI
7-
),
8-
project: .tuist(
9-
generationOptions: .options(
10-
enableCaching: true
11-
)
12-
)
4+
project: .tuist()
135
)

‎Example/Tuist/Package.resolved‎

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

‎Example/Tuist/Package.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,8 @@ let packageSettings = PackageSettings(
1717

1818
let package = Package(
1919
name: "ExampleDependencies",
20-
dependencies: []
20+
dependencies: [
21+
.package(path: "../../"),
22+
.package(url: "https://github.com/apple/swift-numerics", from: "1.1.1"),
23+
]
2124
)

‎Example/mise.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[tools]
2-
tuist = "4.203.0-rc.1"
2+
tuist = "4.193.0"

0 commit comments

Comments
 (0)