Skip to content
This repository was archived by the owner on Apr 21, 2025. It is now read-only.

Commit be1b1ac

Browse files
Merge pull request #32 from GoodNotes/add-swift-format-and-lint-to-swift-tools
Add swift format and lint to swift tools
2 parents 2de983e + 93bef99 commit be1b1ac

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

.github/workflows/release_carton.yml renamed to .github/workflows/build_swift_tools.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
include:
1616
- swift-version: 5.8.0
1717
carton-version: 0.19.0
18+
swift-format-version: 508.0.1
19+
swift-lint-version: 0.52.2
1820

1921
steps:
2022
- name: Checkout the repo
@@ -25,7 +27,7 @@ jobs:
2527
export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true
2628
sudo apt-get -q update
2729
sudo apt-get -q install -y libedit2 libgcc-9-dev libpython2.7 libsqlite3-0 libstdc++-9-dev \
28-
libxml2 libz3-dev zlib1g-dev build-essential libncurses5 libxkbcommon0 curl unzip
30+
libxml2 libz3-dev zlib1g-dev build-essential libncurses5 libxkbcommon0 curl unzip libcurl4-openssl-dev libxml2-dev
2931
3032
- name: Install Binaryen tools
3133
run: |
@@ -50,6 +52,24 @@ jobs:
5052
tar xf swift-toolcahin.tar.gz
5153
mv swift-wasm-* wasm-${{ matrix.swift-version }}-RELEASE
5254
55+
- name: Build Swift-format version ${{ matrix.swift-format-version }}
56+
env:
57+
GH_TOKEN: ${{ github.token }}
58+
run: |
59+
gh repo clone apple/swift-format -- --branch ${{ matrix.swift-format-version }} --single-branch
60+
cd swift-format
61+
swift build -c release
62+
.build/release/swift-format --version
63+
64+
- name: Build SwiftLint version ${{ matrix.swift-lint-version }}
65+
env:
66+
GH_TOKEN: ${{ github.token }}
67+
run: |
68+
gh repo clone realm/SwiftLint -- --branch ${{ matrix.swift-lint-version }} --single-branch
69+
cd SwiftLint
70+
swift build -c release -Xswiftc -static-stdlib --product swiftlint
71+
.build/release/swiftlint --version
72+
5373
- name: Create WASM build tools bundle
5474
id: create-build
5575
run: |
@@ -58,8 +78,10 @@ jobs:
5878
mkdir -p $wasm_tools_dir
5979
mv carton/.build/release/carton $wasm_tools_dir/carton
6080
mv binaryen/bin/wasm-opt $wasm_tools_dir/wasm-opt
81+
mv swift-format/.build/release/swift-format $wasm_tools_dir/swift-format
82+
mv SwiftLint/.build/release/swiftlint $wasm_tools_dir/
6183
mv wasm-${{ matrix.swift-version }}-RELEASE $wasm_tools_dir/
62-
tar cf - $wasm_tools_dir | lz4 > $wasm_tools_dir.tar.lz4
84+
tar cf - $wasm_tools_dir | lz4 -12 > $wasm_tools_dir.tar.lz4
6385
6486
- name: Compute release version number
6587
id: compute-version

0 commit comments

Comments
 (0)