Skip to content

Update CI scripts to support dependency overrides where traits are used #902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonjbeaumont merged 2 commits into from
May 5, 2026
Merged

Update CI scripts to support dependency overrides where traits are used #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5796ddf
Update CI scripts to support dependency overrides where traits are used
simonjbeaumont May 5, 2026
b0dd905
Use if-let because the manual examples don't have package dependency …
simonjbeaumont May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions scripts/run-integration-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,20 @@ log "Extracting name for Swift package: ${PACKAGE_PATH}"
PACKAGE_NAME=$(swift package --package-path "${PACKAGE_PATH}" describe --type json | "${JQ_BIN}" -r .name)

log "Overriding dependency in ${INTEGRATION_TEST_PACKAGE_PATH} on ${PACKAGE_NAME} to use ${PACKAGE_PATH}"
swift package --package-path "${INTEGRATION_TEST_PACKAGE_PATH}" \
edit "${PACKAGE_NAME}" --path "${PACKAGE_PATH}"
cat >> "${INTEGRATION_TEST_PACKAGE_PATH}/Package.swift" << EOF
// BEGIN: Local override for integration testing
guard let dependencyToOverride = package.dependencies.firstIndex(where: { dependency in
switch dependency.kind {
case .sourceControl(_, let location, _) where location.hasSuffix("/${PACKAGE_NAME}"): true
case .registry("${PACKAGE_NAME}", _): true
case .fileSystem("${PACKAGE_NAME}", _): true
default: false
}
}) else { fatalError("Failed to find dependency to override") }
package.dependencies.remove(at: dependencyToOverride)
package.dependencies.append(.package(name: "${PACKAGE_NAME}", path: "${PACKAGE_PATH}"))
// END: Local override for integration testing
EOF

log "Building integration test package: ${INTEGRATION_TEST_PACKAGE_PATH}"
swift build --package-path "${INTEGRATION_TEST_PACKAGE_PATH}"
Expand Down
32 changes: 16 additions & 16 deletions scripts/test-examples.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,26 +51,27 @@ for EXAMPLE_PACKAGE_PATH in $(find "${EXAMPLES_PACKAGE_PATH}" -maxdepth 2 -name
log "Updating mtime of example contents..."
find "${SHARED_EXAMPLE_HARNESS_PACKAGE_PATH}" -print0 | xargs -0 -n1 touch -m

log "Re-overriding dependency in ${EXAMPLE_PACKAGE_NAME} to use ${PACKAGE_PATH}"
"${SWIFT_BIN}" package \
--package-path "${SHARED_EXAMPLE_HARNESS_PACKAGE_PATH}" \
--cache-path "${SHARED_PACKAGE_CACHE_PATH}" \
--skip-update \
--scratch-path "${SHARED_PACKAGE_SCRATCH_PATH}" \
unedit swift-openapi-generator || :
"${SWIFT_BIN}" package \
--package-path "${SHARED_EXAMPLE_HARNESS_PACKAGE_PATH}" \
--cache-path "${SHARED_PACKAGE_CACHE_PATH}" \
--skip-update \
--scratch-path "${SHARED_PACKAGE_SCRATCH_PATH}" \
edit swift-openapi-generator \
--path "${PACKAGE_PATH}"
log "Overriding swift-openapi-generator dependency in ${EXAMPLE_PACKAGE_NAME} to use ${PACKAGE_PATH}"
cat >> "${SHARED_EXAMPLE_HARNESS_PACKAGE_PATH}/Package.swift" << EOF
// BEGIN: Local override for example package testing
if let dependencyToOverride = package.dependencies.firstIndex(where: { dependency in
switch dependency.kind {
case .sourceControl(_, let location, _) where location.hasSuffix("/swift-openapi-generator"): true
case .registry("swift-openapi-generator", _): true
case .fileSystem("swift-openapi-generator", _): true
default: false
}
}) {
package.dependencies.remove(at: dependencyToOverride)
package.dependencies.append(.package(name: "swift-openapi-generator", path: "${PACKAGE_PATH}"))
}
// END: Local override for example package testing
EOF

log "Building example package: ${EXAMPLE_PACKAGE_NAME}"
"${SWIFT_BIN}" build --build-tests \
--package-path "${SHARED_EXAMPLE_HARNESS_PACKAGE_PATH}" \
--cache-path "${SHARED_PACKAGE_CACHE_PATH}" \
--skip-update \
--scratch-path "${SHARED_PACKAGE_SCRATCH_PATH}"
log "✅ Successfully built the example package ${EXAMPLE_PACKAGE_NAME}."

Expand All @@ -79,7 +80,6 @@ for EXAMPLE_PACKAGE_PATH in $(find "${EXAMPLES_PACKAGE_PATH}" -maxdepth 2 -name
"${SWIFT_BIN}" test \
--package-path "${SHARED_EXAMPLE_HARNESS_PACKAGE_PATH}" \
--cache-path "${SHARED_PACKAGE_CACHE_PATH}" \
--skip-update \
--scratch-path "${SHARED_PACKAGE_SCRATCH_PATH}"
log "✅ Passed the tests for the example package ${EXAMPLE_PACKAGE_NAME}."
fi
Expand Down
Loading