Skip to content

Commit faee8ce

Browse files
authored
Merge branch 'swiftlang:main' into dockerless-windows
2 parents ed973bd + 56c1f01 commit faee8ce

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

.github/workflows/scripts/check-docs.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ log() { printf -- "** %s\n" "$*" >&2; }
1717
error() { printf -- "** ERROR: %s\n" "$*" >&2; }
1818
fatal() { error "$@"; exit 1; }
1919

20+
if [ ! -f .spi.yml ]; then
21+
log "No '.spi.yml' found, no documentation targets to check."
22+
exit 0
23+
fi
24+
2025
log "Editing Package.swift..."
2126
cat <<EOF >> "Package.swift"
2227
package.dependencies.append(

.github/workflows/soundness.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
type: boolean
88
description: "Boolean to enable the API breakage check job. Defaults to true."
99
default: true
10+
api_breakage_check_allowlist_path:
11+
type: string
12+
description: "Path to a file that will be passed as --breakage-allowlist-path to swift package diagnose-api-breaking-changes"
13+
default: ""
1014
api_breakage_check_container_image:
1115
type: string
1216
description: "Container image for the API breakage check job. Defaults to latest Swift Ubuntu image."
@@ -89,7 +93,11 @@ jobs:
8993
- name: Run API breakage check
9094
run: |
9195
git fetch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} ${GITHUB_BASE_REF}:pull-base-ref
92-
swift package diagnose-api-breaking-changes pull-base-ref
96+
if [[ -z '${{ inputs.api_breakage_check_allowlist_path }}' ]]; then
97+
swift package diagnose-api-breaking-changes pull-base-ref
98+
else
99+
swift package diagnose-api-breaking-changes pull-base-ref --breakage-allowlist-path '${{ inputs.api_breakage_check_allowlist_path }}'
100+
fi
93101
94102
docs-check:
95103
name: Documentation check
@@ -217,6 +225,7 @@ jobs:
217225
curl -s https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/configs/yamllint.yml > .yamllint.yml
218226
fi
219227
yamllint --strict --config-file .yamllint.yml .
228+
220229
python-lint-check:
221230
name: Python lint check
222231
if: ${{ inputs.python_lint_check_enabled }}

0 commit comments

Comments
 (0)