Skip to content

Commit f170037

Browse files
authored
Merge pull request #832 from ahoppen/yamllint
Update YAML files to pass yamllint
2 parents d143a8a + ee8342e commit f170037

File tree

1 file changed

+42
-43
lines changed

1 file changed

+42
-43
lines changed

.github/workflows/publish_release.yml

+42-43
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,30 @@ jobs:
4141
swift_syntax_tag: ${{ steps.swift_syntax_tag.outputs.swift_syntax_tag }}
4242
swift_format_version: ${{ steps.swift_format_version.outputs.swift_format_version }}
4343
steps:
44-
- name: Determine swift-syntax tag to depend on
45-
id: swift_syntax_tag
46-
shell: bash
47-
run: |
48-
if [[ "${{ github.event.inputs.prerelease }}" == "false" ]]; then
49-
SWIFT_SYNTAX_TAG="${{ github.event.inputs.swift_syntax_tag }}"
50-
else
51-
git clone https://github.com/swiftlang/swift-syntax.git
52-
cd swift-syntax
53-
SWIFT_SYNTAX_TAG="$(git tag | grep ${{ github.event.inputs.swift_syntax_tag }}-prerelease | sort -r | head -1)"
54-
fi
44+
- name: Determine swift-syntax tag to depend on
45+
id: swift_syntax_tag
46+
shell: bash
47+
run: |
48+
if [[ "${{ github.event.inputs.prerelease }}" == "false" ]]; then
49+
SWIFT_SYNTAX_TAG="${{ github.event.inputs.swift_syntax_tag }}"
50+
else
51+
git clone https://github.com/swiftlang/swift-syntax.git
52+
cd swift-syntax
53+
SWIFT_SYNTAX_TAG="$(git tag | grep ${{ github.event.inputs.swift_syntax_tag }}-prerelease | sort -r | head -1)"
54+
fi
5555
56-
echo "Using swift-syntax tag: $SWIFT_SYNTAX_TAG"
57-
echo "swift_syntax_tag=$SWIFT_SYNTAX_TAG" >> "$GITHUB_OUTPUT"
58-
- name: Determine swift-format prerelease version
59-
id: swift_format_version
60-
run: |
61-
if [[ "${{ github.event.inputs.prerelease }}" == "false" ]]; then
62-
SWIFT_FORMAT_VERSION="${{ github.event.inputs.swift_format_version }}"
63-
else
64-
SWIFT_FORMAT_VERSION="${{ github.event.inputs.swift_format_version }}-prerelease-$(date +'%Y-%m-%d')"
65-
fi
66-
echo "Using swift-format version: $SWIFT_FORMAT_VERSION"
67-
echo "swift_format_version=$SWIFT_FORMAT_VERSION" >> "$GITHUB_OUTPUT"
56+
echo "Using swift-syntax tag: $SWIFT_SYNTAX_TAG"
57+
echo "swift_syntax_tag=$SWIFT_SYNTAX_TAG" >> "$GITHUB_OUTPUT"
58+
- name: Determine swift-format prerelease version
59+
id: swift_format_version
60+
run: |
61+
if [[ "${{ github.event.inputs.prerelease }}" == "false" ]]; then
62+
SWIFT_FORMAT_VERSION="${{ github.event.inputs.swift_format_version }}"
63+
else
64+
SWIFT_FORMAT_VERSION="${{ github.event.inputs.swift_format_version }}-prerelease-$(date +'%Y-%m-%d')"
65+
fi
66+
echo "Using swift-format version: $SWIFT_FORMAT_VERSION"
67+
echo "swift_format_version=$SWIFT_FORMAT_VERSION" >> "$GITHUB_OUTPUT"
6868
test_debug:
6969
name: Test in Debug configuration
7070
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
@@ -88,23 +88,22 @@ jobs:
8888
permissions:
8989
contents: write
9090
steps:
91-
- name: Checkout repository
92-
uses: actions/checkout@v4
93-
- name: Create release commits
94-
run: bash .github/workflows/create-release-commits.sh '${{ needs.define_tags.outputs.swift_syntax_tag }}' '${{ needs.define_tags.outputs.swift_format_version }}'
95-
- name: Tag release
96-
run: |
97-
git tag "${{ needs.define_tags.outputs.swift_format_version }}"
98-
git push origin "${{ needs.define_tags.outputs.swift_format_version }}"
99-
- name: Create release
100-
env:
101-
GH_TOKEN: ${{ github.token }}
102-
run: |
103-
if [[ "${{ github.event.inputs.prerelease }}" != "true" ]]; then
104-
# Only create a release automatically for prereleases. For real releases, release notes should be crafted by hand.
105-
exit
106-
fi
107-
gh release create "${{ needs.define_tags.outputs.swift_format_version }}" \
108-
--title "${{ needs.define_tags.outputs.swift_format_version }}" \
109-
--prerelease
110-
91+
- name: Checkout repository
92+
uses: actions/checkout@v4
93+
- name: Create release commits
94+
run: bash .github/workflows/create-release-commits.sh '${{ needs.define_tags.outputs.swift_syntax_tag }}' '${{ needs.define_tags.outputs.swift_format_version }}'
95+
- name: Tag release
96+
run: |
97+
git tag "${{ needs.define_tags.outputs.swift_format_version }}"
98+
git push origin "${{ needs.define_tags.outputs.swift_format_version }}"
99+
- name: Create release
100+
env:
101+
GH_TOKEN: ${{ github.token }}
102+
run: |
103+
if [[ "${{ github.event.inputs.prerelease }}" != "true" ]]; then
104+
# Only create a release automatically for prereleases. For real releases, release notes should be crafted by hand.
105+
exit
106+
fi
107+
gh release create "${{ needs.define_tags.outputs.swift_format_version }}" \
108+
--title "${{ needs.define_tags.outputs.swift_format_version }}" \
109+
--prerelease

0 commit comments

Comments
 (0)