Skip to content

Format source code and run git diff instead of listing first #1093

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Format source code and run git diff instead of listing first #1093

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 22 additions & 4 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,46 @@ jobs:
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Mark the workspace as safe
# https://github.com/actions/checkout/issues/766
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: Check out related PRs
run: |
apt-get update && apt-get install -y curl
curl -s https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/cross-pr-checkout.swift > /tmp/cross-pr-checkout.swift
swift /tmp/cross-pr-checkout.swift "${{ github.repository }}" "${{ github.event.number }}"
- name: Build
run: swift build --configuration release
run: |
swift build --configuration release
- name: Add local swift-format to PATH
run: |
# Add the locally built version of swift-format to PATH so it gets picked up by check-swift-format.sh
echo "PATH=$(pwd)/.build/release:$PATH" >> "$GITHUB_ENV"
- name: Download check format script
run: |
curl https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/check-swift-format.sh > /tmp/check-swift-format.sh
chmod +x /tmp/check-swift-format.sh
- name: Format swift-format
run: .build/release/swift-format lint --parallel --recursive --strict .
run: |
cd "$GITHUB_WORKSPACE"
/tmp/check-swift-format.sh
- name: Checkout swift-syntax
uses: actions/checkout@v4
with:
repository: swiftlang/swift-syntax
persist-credentials: false
path: swift-syntax
- name: Format swift-syntax
run: .build/release/swift-format lint --parallel --recursive --strict swift-syntax
run: |
cd "$GITHUB_WORKSPACE/swift-syntax"
/tmp/check-swift-format.sh
- name: Checkout sourcekit-lsp
uses: actions/checkout@v4
with:
repository: swiftlang/sourcekit-lsp
persist-credentials: false
path: sourcekit-lsp
- name: Format sourcekit-lsp
run: .build/release/swift-format lint --parallel --recursive --strict sourcekit-lsp
run: |
cd "$GITHUB_WORKSPACE/sourcekit-lsp"
/tmp/check-swift-format.sh
Loading