Skip to content

Commit 7969533

Browse files
itaybreitaybre
authored
chore: Rename build folder from Carthage to XCFrameworkBuildPath (#6963)
* chore: Rename build folder from `Carthage` to `SentryOutput` * Rename to `XCFrameworkBuildPath` * Add comment in gitignore
1 parent 7ec71c3 commit 7969533

File tree

20 files changed

+57
-55
lines changed

20 files changed

+57
-55
lines changed

‎.github/ISSUE_TEMPLATE/bug.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ body:
4040
options:
4141
- Swift Package Manager
4242
- CocoaPods
43-
- Carthage
4443
- Manually
4544
validations:
4645
required: true

‎.github/workflows/build-xcframework-variant-slices.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ jobs:
107107
env:
108108
GITHUB_WORKSPACE: ${{ github.workspace }}
109109
run: |
110-
find "$GITHUB_WORKSPACE/Carthage/archive" -name "Sentry.framework" -print0 | xargs -t0 rm -rf
111-
find "$GITHUB_WORKSPACE/Carthage/archive" -name "Sentry.framework.dSYM" -print0 | xargs -t0 rm -rf
110+
find "$GITHUB_WORKSPACE/XCFrameworkBuildPath/archive" -name "Sentry.framework" -print0 | xargs -t0 rm -rf
111+
find "$GITHUB_WORKSPACE/XCFrameworkBuildPath/archive" -name "Sentry.framework.dSYM" -print0 | xargs -t0 rm -rf
112112
shell: bash
113113

114114
# the upload action broke symlinks in the mac sdk slice's xcarchive
@@ -119,7 +119,7 @@ jobs:
119119
INPUT_SUFFIX: ${{ inputs.suffix }}
120120
MATRIX_SDK: ${{ matrix.sdk }}
121121
run: |
122-
ditto -c -k -X --rsrc --keepParent ${GITHUB_WORKSPACE}/Carthage/archive/${INPUT_NAME}${INPUT_SUFFIX}/${MATRIX_SDK}.xcarchive ${INPUT_NAME}${INPUT_SUFFIX}.xcarchive.zip
122+
ditto -c -k -X --rsrc --keepParent ${GITHUB_WORKSPACE}/XCFrameworkBuildPath/archive/${INPUT_NAME}${INPUT_SUFFIX}/${MATRIX_SDK}.xcarchive ${INPUT_NAME}${INPUT_SUFFIX}.xcarchive.zip
123123
shell: bash
124124

125125
- name: Upload xcarchive

‎.github/workflows/release-upload-xcframework.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/download-artifact@v6
3333
with:
3434
name: xcframeworks.zip
35-
path: Carthage/
35+
path: XCFrameworkBuildPath/
3636
github-token: ${{ secrets.GITHUB_TOKEN }}
3737
run-id: ${{ env.FRAMEWORK_RUN_ID }}
3838

@@ -44,4 +44,4 @@ jobs:
4444
if-no-files-found: error
4545
overwrite: true
4646
path: |
47-
${{github.workspace}}/Carthage/*.zip
47+
${{github.workspace}}/XCFrameworkBuildPath/*.zip

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,15 @@ jobs:
121121
- uses: actions/download-artifact@v6
122122
with:
123123
pattern: xcframework-${{github.sha}}-sentry-static
124-
path: Carthage/
124+
path: XCFrameworkBuildPath/
125125
- uses: actions/download-artifact@v6
126126
with:
127127
pattern: xcframework-${{github.sha}}-sentry-swiftui
128-
path: Carthage/
128+
path: XCFrameworkBuildPath/
129129
- run: ./scripts/ci-select-xcode.sh 16.4
130130
- name: Unzip all XCFrameworks
131131
run: |
132-
find Carthage -name "*.xcframework.zip" -print0 | xargs -t0I @ unzip @ -d Carthage
132+
find XCFrameworkBuildPath -name "*.xcframework.zip" -print0 | xargs -t0I @ unzip @ -d XCFrameworkBuildPath
133133
- run: make build-xcframework-sample
134134
- name: Run CI Diagnostics
135135
if: failure()
@@ -289,8 +289,8 @@ jobs:
289289
- uses: actions/download-artifact@v6
290290
with:
291291
pattern: xcframework-${{github.sha}}-sentry-dynamic
292-
path: Carthage/
293-
- run: find Carthage -name "Sentry-Dynamic.xcframework.zip" -print0 | xargs -t0I @ unzip @ -d Carthage
292+
path: XCFrameworkBuildPath/
293+
- run: find XCFrameworkBuildPath -name "Sentry-Dynamic.xcframework.zip" -print0 | xargs -t0I @ unzip @ -d XCFrameworkBuildPath
294294
- name: Build test app with sentry
295295
run: bundle exec fastlane build_perf_test_app_sentry
296296
env:
@@ -342,7 +342,7 @@ jobs:
342342
with:
343343
pattern: xcframework-${{github.sha}}-*
344344
merge-multiple: true
345-
path: Carthage/
345+
path: XCFrameworkBuildPath/
346346

347347
- name: Archive XCFrameworks for Craft
348348
uses: actions/upload-artifact@v5
@@ -351,7 +351,7 @@ jobs:
351351
if-no-files-found: error
352352
overwrite: true
353353
path: |
354-
${{github.workspace}}/Carthage/*.zip
354+
${{github.workspace}}/XCFrameworkBuildPath/*.zip
355355
356356
# update-package-sha.sh uses this env variable to update Package.swift.
357357
# During release Craft calls bump.sh that uses update-package-sha.sh.

‎.github/workflows/ui-tests-common.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@ jobs:
149149
uses: actions/download-artifact@v6
150150
with:
151151
name: xcframework-${{github.sha}}-sentry-static
152-
path: Carthage/
152+
path: XCFrameworkBuildPath/
153153

154154
- name: Unzip XCFramework
155155
if: ${{ inputs.needs_xcframework }}
156156
run: |
157-
unzip -o Carthage/Sentry.xcframework.zip -d Carthage/
157+
unzip -o XCFrameworkBuildPath/Sentry.xcframework.zip -d XCFrameworkBuildPath/
158158
159159
- name: Run Fastlane
160160
env:

‎.github/workflows/version-bump-util.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ jobs:
7979
8080
- name: Create fake xcframework for update-package-sha.sh
8181
run: |
82-
mkdir -p Carthage
83-
echo "<FAKE STATIC ZIP>" > Carthage/Sentry.xcframework.zip
84-
echo "<FAKE DYNAMIC ZIP>" > Carthage/Sentry-Dynamic.xcframework.zip
85-
echo "<FAKE DYNAMIC WITH ARM64E ZIP>" > Carthage/Sentry-Dynamic-WithARM64e.xcframework.zip
86-
echo "<FAKE WITHOUT UIKIT OR APPKIT ZIP>" > Carthage/Sentry-WithoutUIKitOrAppKit.xcframework.zip
87-
echo "<FAKE WITHOUT UIKIT OR APPKIT WITH ARM64E ZIP>" > Carthage/Sentry-WithoutUIKitOrAppKit-WithARM64e.xcframework.zip
82+
mkdir -p XCFrameworkBuildPath
83+
echo "<FAKE STATIC ZIP>" > XCFrameworkBuildPath/Sentry.xcframework.zip
84+
echo "<FAKE DYNAMIC ZIP>" > XCFrameworkBuildPath/Sentry-Dynamic.xcframework.zip
85+
echo "<FAKE DYNAMIC WITH ARM64E ZIP>" > XCFrameworkBuildPath/Sentry-Dynamic-WithARM64e.xcframework.zip
86+
echo "<FAKE WITHOUT UIKIT OR APPKIT ZIP>" > XCFrameworkBuildPath/Sentry-WithoutUIKitOrAppKit.xcframework.zip
87+
echo "<FAKE WITHOUT UIKIT OR APPKIT WITH ARM64E ZIP>" > XCFrameworkBuildPath/Sentry-WithoutUIKitOrAppKit-WithARM64e.xcframework.zip
8888
8989
- name: Bump version
9090
run: ./scripts/bump.sh ${{ steps.generate-version-number.outputs.OLD_VERSION }} ${{ steps.generate-version-number.outputs.NEW_VERSION }}

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ playground.xcworkspace
4141
Packages
4242

4343
# Carthage
44+
# We don't use Carthage anymore, but we keep this folder to avoid uploading local files by mistake.
45+
# Will be removed in the future.
4446
Carthage/Build
4547
Carthage/Checkouts
4648
Carthage
@@ -116,3 +118,6 @@ analyzer
116118

117119
# Output of snapshot testing
118120
**/__Snapshots__
121+
122+
# Output folder for Sentry local builds
123+
XCFrameworkBuildPath/

‎.swiftlint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
excluded:
2-
- "**/Carthage"
32
- Pods
43
- Utils/**/.build
54
- DependencyManagerTests
@@ -10,6 +9,7 @@ excluded:
109
- SentryTestUtils/Dynamic/**
1110
- .build/**
1211
- .git/**
12+
- XCFrameworkBuildPath/**
1313

1414
only_rules:
1515
- class_delegate_protocol

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ format: format-clang format-swift-all format-markdown format-json format-yaml
5555
# Format ObjC, ObjC++, C, and C++
5656
format-clang:
5757
@find . -type f \( -name "*.h" -or -name "*.hpp" -or -name "*.c" -or -name "*.cpp" -or -name "*.m" -or -name "*.mm" \) -and \
58-
! \( -path "**.build/*" -or -path "**Build/*" -or -path "**/Carthage/Checkouts/*" -or -path "**/libs/**" -or -path "**/Pods/**" -or -path "**/*.xcarchive/*" \) \
58+
! \( -path "**.build/*" -or -path "**Build/*" -or -path "**/libs/**" -or -path "**/Pods/**" -or -path "**/*.xcarchive/*" \) \
5959
| xargs clang-format -i -style=file
6060

6161
# Format all Swift files

‎Samples/XCFramework-Validation/XCFramework.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
/* End PBXCopyFilesBuildPhase section */
3737

3838
/* Begin PBXFileReference section */
39-
1573CAE22BBCA4820018A2B7 /* SentrySwiftUI.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:97JCY7859U:GetSentry LLC"; lastKnownFileType = wrapper.xcframework; name = SentrySwiftUI.xcframework; path = ../../Carthage/SentrySwiftUI.xcframework; sourceTree = "<group>"; };
39+
1573CAE22BBCA4820018A2B7 /* SentrySwiftUI.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:97JCY7859U:GetSentry LLC"; lastKnownFileType = wrapper.xcframework; name = SentrySwiftUI.xcframework; path = ../../XCFrameworkBuildPath/SentrySwiftUI.xcframework; sourceTree = "<group>"; };
4040
1573CAE62BBCA8260018A2B7 /* CheckTracedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckTracedView.swift; sourceTree = "<group>"; };
4141
7BA13E2E267B3F5200DEE308 /* XCFramework.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = XCFramework.app; sourceTree = BUILT_PRODUCTS_DIR; };
4242
7BA13E31267B3F5200DEE308 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -46,7 +46,7 @@
4646
7BA13E3A267B3F5400DEE308 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
4747
7BA13E3D267B3F5400DEE308 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4848
7BA13E3F267B3F5400DEE308 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
49-
7BA13E46267B4A2D00DEE308 /* Sentry.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:97JCY7859U:GetSentry LLC"; lastKnownFileType = wrapper.xcframework; name = Sentry.xcframework; path = ../../Carthage/Sentry.xcframework; sourceTree = "<group>"; };
49+
7BA13E46267B4A2D00DEE308 /* Sentry.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:97JCY7859U:GetSentry LLC"; lastKnownFileType = wrapper.xcframework; name = Sentry.xcframework; path = ../../XCFrameworkBuildPath/Sentry.xcframework; sourceTree = "<group>"; };
5050
/* End PBXFileReference section */
5151

5252
/* Begin PBXFrameworksBuildPhase section */

0 commit comments

Comments
 (0)