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

Up swift5.7
mironal · Oct 5, 2022 · 79e90e9 · 79e90e9
2 parents 404e8e3 + 3f419f2
commit 79e90e9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
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
@@ -6,26 +6,26 @@
         "repositoryURL": "https://github.com/apple/swift-argument-parser.git",
         "state": {
           "branch": null,
-          "revision": "82905286cc3f0fa8adc4674bf49437cab65a8373",
-          "version": "1.1.1"
+          "revision": "9f39744e025c7d377987f30b03770805dcb0bcd1",
+          "version": "1.1.4"
         }
       },
       {
         "package": "swift-format",
         "repositoryURL": "https://github.com/apple/swift-format",
         "state": {
           "branch": null,
-          "revision": "e6b8c60c7671066d229e30efa1e31acf57be412e",
-          "version": "0.50600.1"
+          "revision": "3dd9b517b9e9846435aa782d769ef5825e7c2d65",
+          "version": "0.50700.0"
         }
       },
       {
         "package": "SwiftSyntax",
         "repositoryURL": "https://github.com/apple/swift-syntax",
         "state": {
           "branch": null,
-          "revision": "0b6c22b97f8e9320bca62e82cdbee601cf37ad3f",
-          "version": "0.50600.1"
+          "revision": "04d4497be6b88e524a71778d828790e9589ae1c4",
+          "version": "0.50700.0"
         }
       },
       {
@@ -42,8 +42,8 @@
         "repositoryURL": "https://github.com/apple/swift-tools-support-core.git",
         "state": {
           "branch": null,
-          "revision": "b7667f3e266af621e5cc9c77e74cacd8e8c00cb4",
-          "version": "0.2.5"
+          "revision": "4f07be3dc201f6e2ee85b6942d0c220a16926811",
+          "version": "0.2.7"
         }
       }
     ]

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