Merge pull request #32 from GoodNotes/add-swift-format-and-lint-to-sw…

…ift-tools Add swift format and lint to swift tools
GoodNotes · Jun 14, 2023 · be1b1ac · be1b1ac
2 parents 2de983e + 93bef99
commit be1b1ac
Showing 1 changed file with 24 additions and 2 deletions.
diff --git a/.github/workflows/release_carton.yml → .github/workflows/build_swift_tools.yml b/.github/workflows/release_carton.yml → .github/workflows/build_swift_tools.yml
@@ -15,6 +15,8 @@ jobs:
         include:
           - swift-version: 5.8.0
             carton-version: 0.19.0
+            swift-format-version: 508.0.1
+            swift-lint-version: 0.52.2
 
     steps:
       - name: Checkout the repo
@@ -25,7 +27,7 @@ jobs:
           export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true 
           sudo apt-get -q update
           sudo apt-get -q install -y libedit2 libgcc-9-dev libpython2.7 libsqlite3-0 libstdc++-9-dev \
-            libxml2 libz3-dev zlib1g-dev build-essential libncurses5 libxkbcommon0 curl unzip
+            libxml2 libz3-dev zlib1g-dev build-essential libncurses5 libxkbcommon0 curl unzip libcurl4-openssl-dev libxml2-dev
 
       - name: Install Binaryen tools
         run: |
@@ -50,6 +52,24 @@ jobs:
           tar xf swift-toolcahin.tar.gz
           mv swift-wasm-* wasm-${{ matrix.swift-version }}-RELEASE
 
+      - name: Build Swift-format version ${{ matrix.swift-format-version }}
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh repo clone apple/swift-format -- --branch ${{ matrix.swift-format-version }} --single-branch
+          cd swift-format
+          swift build -c release
+          .build/release/swift-format --version
+
+      - name: Build SwiftLint version ${{ matrix.swift-lint-version }}
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh repo clone realm/SwiftLint -- --branch ${{ matrix.swift-lint-version }} --single-branch
+          cd SwiftLint
+          swift build -c release -Xswiftc -static-stdlib --product swiftlint
+          .build/release/swiftlint --version
+
       - name: Create WASM build tools bundle
         id: create-build
         run: |
@@ -58,8 +78,10 @@ jobs:
           mkdir -p $wasm_tools_dir
           mv carton/.build/release/carton $wasm_tools_dir/carton
           mv binaryen/bin/wasm-opt $wasm_tools_dir/wasm-opt
+          mv swift-format/.build/release/swift-format $wasm_tools_dir/swift-format
+          mv SwiftLint/.build/release/swiftlint $wasm_tools_dir/
           mv wasm-${{ matrix.swift-version }}-RELEASE $wasm_tools_dir/
-          tar cf - $wasm_tools_dir | lz4 > $wasm_tools_dir.tar.lz4
+          tar cf - $wasm_tools_dir | lz4 -12 > $wasm_tools_dir.tar.lz4
 
       - name: Compute release version number
         id: compute-version