Skip to content

Commit caf3350

Browse files
authored
Merge pull request #15 from ahoppen/yaml-format
Format the YAML files so they pass yamllint
2 parents 817cd2d + d06e465 commit caf3350

File tree

2 files changed

+75
-75
lines changed

2 files changed

+75
-75
lines changed

.github/workflows/soundness.yml

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
unacceptable_language_check_word_list:
2727
type: string
2828
description: "List of unacceptable words. Defaults to a sensible list of words."
29-
default: "blacklist whitelist slave master sane sanity insane insanity kill killed killing hang hung hanged hanging" #ignore-unacceptable-language
29+
default: "blacklist whitelist slave master sane sanity insane insanity kill killed killing hang hung hanged hanging" # ignore-unacceptable-language
3030
license_header_check_enabled:
3131
type: boolean
3232
description: "Boolean to enable the license header check job. Defaults to true."
@@ -56,7 +56,7 @@ on:
5656
concurrency:
5757
group: ${{ github.workflow }}-${{ github.ref }}-soundness
5858
cancel-in-progress: true
59-
59+
6060
jobs:
6161
api-breakage-check:
6262
name: API breakage check
@@ -66,17 +66,17 @@ jobs:
6666
image: ${{ inputs.api_breakage_check_container_image }}
6767
timeout-minutes: 20
6868
steps:
69-
- name: Checkout repository
70-
uses: actions/checkout@v4
71-
with:
72-
persist-credentials: false
73-
- name: Mark the workspace as safe
74-
# https://github.com/actions/checkout/issues/766
75-
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
76-
- name: Run API breakage check
77-
run: |
78-
git fetch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} ${GITHUB_BASE_REF}:pull-base-ref
79-
swift package diagnose-api-breaking-changes pull-base-ref
69+
- name: Checkout repository
70+
uses: actions/checkout@v4
71+
with:
72+
persist-credentials: false
73+
- name: Mark the workspace as safe
74+
# https://github.com/actions/checkout/issues/766
75+
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
76+
- name: Run API breakage check
77+
run: |
78+
git fetch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} ${GITHUB_BASE_REF}:pull-base-ref
79+
swift package diagnose-api-breaking-changes pull-base-ref
8080
8181
docs-check:
8282
name: Documentation check
@@ -86,57 +86,57 @@ jobs:
8686
image: ${{ inputs.docs_check_container_image }}
8787
timeout-minutes: 20
8888
steps:
89-
- name: Checkout repository
90-
uses: actions/checkout@v4
91-
with:
89+
- name: Checkout repository
90+
uses: actions/checkout@v4
91+
with:
9292
persist-credentials: false
93-
- name: Run documentation check
94-
run: |
95-
apt-get -qq update && apt-get -qq -y install curl yq
96-
curl -s https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/check-docs.sh | bash
93+
- name: Run documentation check
94+
run: |
95+
apt-get -qq update && apt-get -qq -y install curl yq
96+
curl -s https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/check-docs.sh | bash
9797
9898
unacceptable-language-check:
9999
name: Unacceptable language check
100100
if: ${{ inputs.unacceptable_language_check_enabled }}
101101
runs-on: ubuntu-latest
102102
timeout-minutes: 1
103103
steps:
104-
- name: Checkout repository
105-
uses: actions/checkout@v4
106-
with:
104+
- name: Checkout repository
105+
uses: actions/checkout@v4
106+
with:
107107
persist-credentials: false
108-
- name: Run unacceptable language check
109-
env:
110-
UNACCEPTABLE_WORD_LIST: ${{ inputs.unacceptable_language_check_word_list}}
111-
run: curl -s https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/check-unacceptable-language.sh | bash
108+
- name: Run unacceptable language check
109+
env:
110+
UNACCEPTABLE_WORD_LIST: ${{ inputs.unacceptable_language_check_word_list}}
111+
run: curl -s https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/check-unacceptable-language.sh | bash
112112

113113
license-header-check:
114114
name: License headers check
115115
if: ${{ inputs.license_header_check_enabled }}
116116
runs-on: ubuntu-latest
117117
timeout-minutes: 1
118118
steps:
119-
- name: Checkout repository
120-
uses: actions/checkout@v4
121-
with:
119+
- name: Checkout repository
120+
uses: actions/checkout@v4
121+
with:
122122
persist-credentials: false
123-
- name: Run license header check
124-
env:
125-
PROJECT_NAME: ${{ inputs.license_header_check_project_name }}
126-
run: curl -s https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/check-license-header.sh | bash
123+
- name: Run license header check
124+
env:
125+
PROJECT_NAME: ${{ inputs.license_header_check_project_name }}
126+
run: curl -s https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/check-license-header.sh | bash
127127

128128
broken-symlink-check:
129129
name: Broken symlinks check
130130
if: ${{ inputs.broken_symlink_check_enabled }}
131131
runs-on: ubuntu-latest
132132
timeout-minutes: 1
133133
steps:
134-
- name: Checkout repository
135-
uses: actions/checkout@v4
136-
with:
134+
- name: Checkout repository
135+
uses: actions/checkout@v4
136+
with:
137137
persist-credentials: false
138-
- name: Run broken symlinks check
139-
run: curl -s https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/check-broken-symlinks.sh | bash
138+
- name: Run broken symlinks check
139+
run: curl -s https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/check-broken-symlinks.sh | bash
140140

141141
format-check:
142142
name: Format check
@@ -146,17 +146,17 @@ jobs:
146146
image: swift:6.0-jammy
147147
timeout-minutes: 10
148148
steps:
149-
- name: Checkout repository
150-
uses: actions/checkout@v4
151-
with:
149+
- name: Checkout repository
150+
uses: actions/checkout@v4
151+
with:
152152
persist-credentials: false
153-
- name: Mark the workspace as safe
154-
# https://github.com/actions/checkout/issues/766
155-
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
156-
- name: Run format check
157-
run: |
158-
apt-get -qq update && apt-get -qq -y install curl
159-
curl -s https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/check-swift-format.sh | bash
153+
- name: Mark the workspace as safe
154+
# https://github.com/actions/checkout/issues/766
155+
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
156+
- name: Run format check
157+
run: |
158+
apt-get -qq update && apt-get -qq -y install curl
159+
curl -s https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/check-swift-format.sh | bash
160160
161161
shell-check:
162162
name: Shell check
@@ -166,14 +166,14 @@ jobs:
166166
image: ${{ inputs.shell_check_container_image }}
167167
timeout-minutes: 5
168168
steps:
169-
- name: Checkout repository
170-
uses: actions/checkout@v4
171-
with:
169+
- name: Checkout repository
170+
uses: actions/checkout@v4
171+
with:
172172
persist-credentials: false
173-
- name: Mark the workspace as safe
174-
# https://github.com/actions/checkout/issues/766
175-
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
176-
- name: Run shellcheck
177-
run: |
178-
apt-get -qq update && apt-get -qq -y install shellcheck
179-
git ls-files -z '*.sh' | xargs -0 shellcheck
173+
- name: Mark the workspace as safe
174+
# https://github.com/actions/checkout/issues/766
175+
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
176+
- name: Run shellcheck
177+
run: |
178+
apt-get -qq update && apt-get -qq -y install shellcheck
179+
git ls-files -z '*.sh' | xargs -0 shellcheck

.github/workflows/swift_package_test.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,22 @@ jobs:
4141
swift_version: ['5.8', '5.9', '5.10', '6.0', 'nightly-main', 'nightly-6.0']
4242
os_version: ${{ fromJson(inputs.os_versions) }}
4343
exclude:
44-
- ${{ fromJson(inputs.exclude_swift_versions) }}
44+
- ${{ fromJson(inputs.exclude_swift_versions) }}
4545
container:
4646
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
4747
steps:
48-
- name: Swift version
49-
run: swift --version
50-
- name: Checkout repository
51-
uses: actions/checkout@v4
52-
- name: Set environment variables
53-
if: ${{ inputs.env_vars }}
54-
run: |
55-
for i in "${{ inputs.env_vars }}"
56-
do
57-
printf "%s\n" $i >> $GITHUB_ENV
58-
done
59-
- name: Pre-build
60-
run: ${{ inputs.pre_build_command }}
61-
- name: Build / Test
62-
run: ${{ inputs.build_command }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}
48+
- name: Swift version
49+
run: swift --version
50+
- name: Checkout repository
51+
uses: actions/checkout@v4
52+
- name: Set environment variables
53+
if: ${{ inputs.env_vars }}
54+
run: |
55+
for i in "${{ inputs.env_vars }}"
56+
do
57+
printf "%s\n" $i >> $GITHUB_ENV
58+
done
59+
- name: Pre-build
60+
run: ${{ inputs.pre_build_command }}
61+
- name: Build / Test
62+
run: ${{ inputs.build_command }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}

0 commit comments

Comments
 (0)