Merge pull request mironal#143 from mironal/up-swift5.7

mironal · web-flow · commit 79e90e921992 · 2022-10-05T14:48:06.000+09:00
Up swift5.7
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -16,23 +16,18 @@ jobs:
         with:
           path: BuildTools/.build
           key: ${{ runner.os }}-spm-${{ hashFiles('**/BuildTools/Package.resolved') }}
-          restore-keys: |
-            ${{ runner.os }}-spm-
       - uses: fwal/setup-swift@v1
         with:
-          swift-version: "5.6"
+          swift-version: "5.7"
       - name: Install Sourcery
         run: brew update && brew install sourcery
       - name: Check Flat API
         run: ./flat-api.sh -c
-      - name: Build tools & Lint
+      - name: Build tools
         if: steps.cache-spm.outputs.cache-hit != 'true'
-        run: swift run -c release --package-path BuildTools swift-format lint -p --strict --recursive ./Sources ./Tests ./scripts
+        run: ./build_tools.sh
       - name: Lint
-        if: steps.cache-spm.outputs.cache-hit == 'true'
-        run: |
-          swift run -c release --skip-build --package-path BuildTools swift-format --version
-          swift run -c release --skip-build --package-path BuildTools swift-format lint -p --strict --recursive ./Sources ./Tests ./scripts
+        run: ./lint.sh
       - name: Build
         run: swift build
 
diff --git a/BuildTools/Package.resolved b/BuildTools/Package.resolved
diff --git a/BuildTools/Package.swift b/BuildTools/Package.swift
@@ -1,11 +1,11 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.5
 import PackageDescription
 
 let package = Package(
     name: "BuildTools",
     platforms: [.macOS(.v10_11)],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-format", from: "0.50600.1"),
+        .package(url: "https://github.com/apple/swift-format", from: "0.50700.0"),
     ],
     targets: [.target(name: "BuildTools", path: "")]
 )
diff --git a/build_tools.sh b/build_tools.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-swift build -c release --package-path BuildTools
+swift build -c release --package-path BuildTools --product swift-format

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/usr/bin/env bash`
`2`		`-swift build -c release --package-path BuildTools`
	`2`	`+swift build -c release --package-path BuildTools --product swift-format`