Skip to content

Commit e36128b

Browse files
authored
chore(ci): Remove Package.swift checks (#6110)
1 parent f5666e7 commit e36128b

File tree

6 files changed

+3
-126
lines changed

6 files changed

+3
-126
lines changed

.github/file-filters.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -371,17 +371,6 @@ run_testflight_for_pushes: &run_testflight_for_pushes
371371
- "fastlane/**"
372372
- "Makefile"
373373

374-
run_check_package_diff_for_prs: &run_check_package_diff_for_prs
375-
- ".github/workflows/check-package-diff.yml"
376-
- ".github/file-filters.yml"
377-
378-
# Package files
379-
- "Package*.swift"
380-
381-
# Build configuration
382-
- "Makefile"
383-
- "Utils/expected_package_diff.patch"
384-
385374
run_codeql_analysis_for_prs: &run_codeql_analysis_for_prs
386375
- "Sources/**"
387376

.github/workflows/check-package-diff.yml

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

.github/workflows/release.yml

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
# the github.sha is be the pre merge commit id for PRs.
130130
# See https://github.community/t/github-sha-isnt-the-value-expected/17903/17906.
131131
validate-spm:
132-
name: Validate SPM Static ${{matrix.package-file.name}}
132+
name: Validate SPM Static
133133
runs-on: macos-14
134134
needs: [files-changed, assemble-xcframework-variant]
135135
# Run the job only for PRs with related changes or non-PR events.
@@ -144,20 +144,14 @@ jobs:
144144
uses: ./.github/actions/prepare-package.swift
145145
with:
146146
is-pr: ${{ github.event_name == 'pull_request' }}
147-
package-file: ${{matrix.package-file.name}}
148147
- run: swift build
149148
working-directory: Samples/macOS-SPM-CommandLine
150149
- name: Run CI Diagnostics
151150
if: failure()
152151
run: ./scripts/ci-diagnostics.sh
153-
strategy:
154-
matrix:
155-
package-file:
156-
- name: Package.swift
157-
158152

159153
validate-spm-dynamic:
160-
name: Validate SPM Dynamic ${{matrix.package-file.name}}
154+
name: Validate SPM Dynamic
161155
runs-on: macos-14
162156
needs: [files-changed, assemble-xcframework-variant]
163157
# Run the job only for PRs with related changes or non-PR events.
@@ -172,20 +166,14 @@ jobs:
172166
uses: ./.github/actions/prepare-package.swift
173167
with:
174168
is-pr: ${{ github.event_name == 'pull_request' }}
175-
package-file: ${{matrix.package-file.name}}
176169
- run: swift build
177170
working-directory: Samples/SPM-Dynamic
178171
- name: Run CI Diagnostics
179172
if: failure()
180173
run: ./scripts/ci-diagnostics.sh
181-
strategy:
182-
matrix:
183-
package-file:
184-
- name: Package.swift
185-
186174

187175
swift-build:
188-
name: Build Swift Static ${{matrix.package-file.name}}
176+
name: Build Swift Static
189177
runs-on: macos-14
190178
needs: [files-changed, assemble-xcframework-variant]
191179
# Run the job only for PRs with related changes or non-PR events.
@@ -200,16 +188,10 @@ jobs:
200188
uses: ./.github/actions/prepare-package.swift
201189
with:
202190
is-pr: ${{ github.event_name == 'pull_request' }}
203-
package-file: ${{matrix.package-file.name}}
204191
- run: swift build
205192
- name: Run CI Diagnostics
206193
if: failure()
207194
run: ./scripts/ci-diagnostics.sh
208-
strategy:
209-
matrix:
210-
package-file:
211-
- name: Package.swift
212-
213195

214196
validate-spm-visionos:
215197
name: Validate SPM Static visionOS
@@ -227,7 +209,6 @@ jobs:
227209
uses: ./.github/actions/prepare-package.swift
228210
with:
229211
is-pr: ${{ github.event_name == 'pull_request' }}
230-
package-file: [email protected]
231212
- run: set -o pipefail &&xcodebuild build -scheme visionOS-SPM -sdk xros -destination 'generic/platform=xros' | tee raw-build-output-spm-visionOS.log | xcbeautify
232213
working-directory: Samples/visionOS-SPM
233214
- name: Run CI Diagnostics

Makefile

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -189,18 +189,3 @@ xcode-ci:
189189
xcodegen --spec Samples/watchOS-Swift/watchOS-Swift.yml
190190
xcodegen --spec TestSamples/SwiftUITestSample/SwiftUITestSample.yml
191191
xcodegen --spec TestSamples/SwiftUICrashTest/SwiftUICrashTest.yml
192-
193-
.PHONY: check-package-diff update-package-diff
194-
# Diff will return an error if the files are different, so we need to ignore it with `|| true`.
195-
check-package-diff:
196-
diff Package.swift [email protected] > current_package_diff.patch || true
197-
@if diff ./Utils/expected_package_diff.patch current_package_diff.patch > /dev/null 2>&1; then \
198-
echo "--> Package diff check passed - no changes detected"; \
199-
else \
200-
echo "--> Package diff check failed - changes detected! Make sure to run \"make update-package-diff\" to update the expected diff."; \
201-
exit 1; \
202-
fi
203-
204-
# Diff will return an error if the files are different, so we need to ignore it with `|| true`.
205-
update-package-diff:
206-
diff Package.swift [email protected] > ./Utils/expected_package_diff.patch || true

Utils/VersionBump/main.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ let fromVersionFile = "./Sentry.podspec"
3939
let files = [
4040
"./Sentry.podspec",
4141
"./Package.swift",
42-
4342
"./SentryPrivate.podspec",
4443
"./SentrySwiftUI.podspec",
4544
"./Sources/Sentry/SentryMeta.m",

Utils/expected_package_diff.patch

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

0 commit comments

Comments
 (0)