Skip to content

Commit 2a514c6

Browse files
authored
Merge branch 'main' into cluster_set
2 parents bf57031 + 38e7b97 commit 2a514c6

File tree

147 files changed

+7457
-9929
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+7457
-9929
lines changed

.eslintignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

.eslintrc

Lines changed: 0 additions & 23 deletions
This file was deleted.

.github/actions/setup/action.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,24 @@ runs:
88
uses: actions/setup-node@v3
99
with:
1010
node-version-file: .nvmrc
11+
- name: Enable corepack
12+
run: corepack enable
13+
shell: bash
1114

1215
- name: Cache dependencies
1316
id: yarn-cache
1417
uses: actions/cache@v3
1518
with:
1619
path: |
1720
**/node_modules
18-
.yarn/install-state.gz
1921
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}-${{ hashFiles('**/package.json', '!node_modules/**') }}
2022
restore-keys: |
2123
${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
2224
${{ runner.os }}-yarn-
2325
2426
- name: Install dependencies
2527
if: steps.yarn-cache.outputs.cache-hit != 'true'
26-
run: yarn install --immutable
28+
run: yarn install --frozen-lockfile
2729
shell: bash
2830

2931
- name: Prepare Dummy Secrets

.github/workflows/ci.yml

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ jobs:
1919

2020
- uses: actions/setup-java@v4
2121
with:
22-
distribution: 'zulu'
23-
java-version: '17'
24-
25-
# - name: Cache Gradle
26-
# uses: actions/cache@v4
27-
# with:
28-
# path: |
29-
# ~/.gradle/wrapper
30-
# ~/.gradle/caches
31-
# key: ${{ runner.os }}-gradle-${{ hashFiles('example/android/gradle/wrapper/gradle-wrapper.properties') }}-lint
32-
# restore-keys: |
33-
# ${{ runner.os }}-gradle-${{matrix.arch}}-lint-
22+
distribution: "zulu"
23+
java-version: "17"
24+
25+
# - name: Cache Gradle
26+
# uses: actions/cache@v4
27+
# with:
28+
# path: |
29+
# ~/.gradle/wrapper
30+
# ~/.gradle/caches
31+
# key: ${{ runner.os }}-gradle-${{ hashFiles('example/android/gradle/wrapper/gradle-wrapper.properties') }}-lint
32+
# restore-keys: |
33+
# ${{ runner.os }}-gradle-${{matrix.arch}}-lint-
3434

3535
- name: Install ktlint
3636
run: |
@@ -39,31 +39,31 @@ jobs:
3939
sudo mv ktlint /usr/local/bin/
4040
4141
- name: Check
42-
run: yarn t
43-
44-
# test:
45-
# runs-on: ubuntu-latest
46-
# steps:
47-
# - name: Checkout
48-
# uses: actions/checkout@v3
49-
#
50-
# - name: Setup
51-
# uses: ./.github/actions/setup
52-
#
53-
# - name: Run unit tests
54-
# run: yarn test --maxWorkers=2 --coverage
55-
56-
# build-library:
57-
# runs-on: ubuntu-latest
58-
# steps:
59-
# - name: Checkout
60-
# uses: actions/checkout@v3
61-
#
62-
# - name: Setup
63-
# uses: ./.github/actions/setup
64-
#
65-
# - name: Build package
66-
# run: yarn prepare
42+
run: yarn run t
43+
44+
# test:
45+
# runs-on: ubuntu-latest
46+
# steps:
47+
# - name: Checkout
48+
# uses: actions/checkout@v3
49+
#
50+
# - name: Setup
51+
# uses: ./.github/actions/setup
52+
#
53+
# - name: Run unit tests
54+
# run: yarn test --maxWorkers=2 --coverage
55+
56+
# build-library:
57+
# runs-on: ubuntu-latest
58+
# steps:
59+
# - name: Checkout
60+
# uses: actions/checkout@v3
61+
#
62+
# - name: Setup
63+
# uses: ./.github/actions/setup
64+
#
65+
# - name: Build package
66+
# run: yarn prepare
6767

6868
build-android:
6969
runs-on: ubuntu-latest
@@ -76,8 +76,8 @@ jobs:
7676
- name: Setup
7777
uses: ./.github/actions/setup
7878

79-
80-
79+
- name: Set Android Home
80+
run: echo "sdk.dir=$ANDROID_HOME" > example/android/local.properties
8181

8282
- name: Cache turborepo for Android
8383
uses: actions/cache@v4
@@ -98,8 +98,8 @@ jobs:
9898
- name: Install JDK
9999
uses: actions/setup-java@v3
100100
with:
101-
distribution: 'zulu'
102-
java-version: '17'
101+
distribution: "zulu"
102+
java-version: "17"
103103

104104
- name: Setup Android SDK
105105
uses: android-actions/setup-android@v3
@@ -166,4 +166,3 @@ jobs:
166166
run: yarn pod:update
167167
- name: Build example for iOS
168168
run: yarn turbo:ios
169-

.github/workflows/doc-publish.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@ jobs:
2424
publish_dir: ./docs
2525
user_name: github-actions[bot]
2626
user_email: 41898282+github-actions[bot]@users.noreply.github.com
27-

.github/workflows/stale.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.gitignore

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,13 @@ example/vendor/
5353
#
5454
node_modules/
5555
npm-debug.log
56-
yarn-debug.log
57-
yarn-error.log
5856

5957
# BUCK
6058
buck-out/
6159
\.buckd/
6260
android/app/libs
6361
android/keystores/debug.keystore
6462

65-
# Yarn
66-
.yarn/*
67-
!.yarn/patches
68-
!.yarn/plugins
69-
!.yarn/releases
70-
!.yarn/sdks
71-
!.yarn/versions
7263

7364
# Expo
7465
.expo/
@@ -88,3 +79,15 @@ docs/
8879

8980
example/.watchman-*
9081
*.bak
82+
83+
84+
# Yarn
85+
.yarn/*
86+
!.yarn/patches
87+
!.yarn/plugins
88+
!.yarn/releases
89+
!.yarn/sdks
90+
!.yarn/versions
91+
yarn-debug.log
92+
yarn-error.log
93+

.husky/_/check

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ call_lefthook()
3333
then
3434
"$dir/node_modules/lefthook/bin/index.js" "$@"
3535

36+
elif go tool lefthook -h >/dev/null 2>&1
37+
then
38+
go tool lefthook "$@"
3639
elif bundle exec lefthook -h >/dev/null 2>&1
3740
then
3841
bundle exec lefthook "$@"
@@ -42,15 +45,21 @@ call_lefthook()
4245
elif pnpm lefthook -h >/dev/null 2>&1
4346
then
4447
pnpm lefthook "$@"
45-
elif swift package plugin lefthook >/dev/null 2>&1
48+
elif swift package lefthook >/dev/null 2>&1
4649
then
47-
swift package --disable-sandbox plugin lefthook "$@"
50+
swift package --build-path .build/lefthook --disable-sandbox lefthook "$@"
4851
elif command -v mint >/dev/null 2>&1
4952
then
5053
mint run csjones/lefthook-plugin "$@"
51-
elif command -v npx >/dev/null 2>&1
54+
elif uv run lefthook -h >/dev/null 2>&1
55+
then
56+
uv run lefthook "$@"
57+
elif mise exec -- lefthook -h >/dev/null 2>&1
58+
then
59+
mise exec -- lefthook "$@"
60+
elif devbox run lefthook -h >/dev/null 2>&1
5261
then
53-
npx lefthook "$@"
62+
devbox run lefthook "$@"
5463
else
5564
echo "Can't find lefthook in PATH"
5665
fi

.husky/_/commit-msg

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
#!/bin/sh
2+
3+
if [ "$LEFTHOOK_VERBOSE" = "1" -o "$LEFTHOOK_VERBOSE" = "true" ]; then
4+
set -x
5+
fi
6+
7+
if [ "$LEFTHOOK" = "0" ]; then
8+
exit 0
9+
fi
10+
11+
call_lefthook()
12+
{
13+
if test -n "$LEFTHOOK_BIN"
14+
then
15+
"$LEFTHOOK_BIN" "$@"
16+
elif lefthook -h >/dev/null 2>&1
17+
then
18+
lefthook "$@"
19+
else
20+
dir="$(git rev-parse --show-toplevel)"
21+
osArch=$(uname | tr '[:upper:]' '[:lower:]')
22+
cpuArch=$(uname -m | sed 's/aarch64/arm64/;s/x86_64/x64/')
23+
if test -f "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
24+
then
25+
"$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
26+
elif test -f "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
27+
then
28+
"$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
29+
elif test -f "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
30+
then
31+
"$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
32+
elif test -f "$dir/node_modules/lefthook/bin/index.js"
33+
then
34+
"$dir/node_modules/lefthook/bin/index.js" "$@"
35+
36+
elif go tool lefthook -h >/dev/null 2>&1
37+
then
38+
go tool lefthook "$@"
39+
elif bundle exec lefthook -h >/dev/null 2>&1
40+
then
41+
bundle exec lefthook "$@"
42+
elif yarn lefthook -h >/dev/null 2>&1
43+
then
44+
yarn lefthook "$@"
45+
elif pnpm lefthook -h >/dev/null 2>&1
46+
then
47+
pnpm lefthook "$@"
48+
elif swift package lefthook >/dev/null 2>&1
49+
then
50+
swift package --build-path .build/lefthook --disable-sandbox lefthook "$@"
51+
elif command -v mint >/dev/null 2>&1
52+
then
53+
mint run csjones/lefthook-plugin "$@"
54+
elif uv run lefthook -h >/dev/null 2>&1
55+
then
56+
uv run lefthook "$@"
57+
elif mise exec -- lefthook -h >/dev/null 2>&1
58+
then
59+
mise exec -- lefthook "$@"
60+
elif devbox run lefthook -h >/dev/null 2>&1
61+
then
62+
devbox run lefthook "$@"
63+
else
64+
echo "Can't find lefthook in PATH"
65+
fi
66+
fi
67+
}
68+
69+
call_lefthook run "commit-msg" "$@"

.husky/_/format

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ call_lefthook()
3333
then
3434
"$dir/node_modules/lefthook/bin/index.js" "$@"
3535

36+
elif go tool lefthook -h >/dev/null 2>&1
37+
then
38+
go tool lefthook "$@"
3639
elif bundle exec lefthook -h >/dev/null 2>&1
3740
then
3841
bundle exec lefthook "$@"
@@ -42,15 +45,21 @@ call_lefthook()
4245
elif pnpm lefthook -h >/dev/null 2>&1
4346
then
4447
pnpm lefthook "$@"
45-
elif swift package plugin lefthook >/dev/null 2>&1
48+
elif swift package lefthook >/dev/null 2>&1
4649
then
47-
swift package --disable-sandbox plugin lefthook "$@"
50+
swift package --build-path .build/lefthook --disable-sandbox lefthook "$@"
4851
elif command -v mint >/dev/null 2>&1
4952
then
5053
mint run csjones/lefthook-plugin "$@"
51-
elif command -v npx >/dev/null 2>&1
54+
elif uv run lefthook -h >/dev/null 2>&1
55+
then
56+
uv run lefthook "$@"
57+
elif mise exec -- lefthook -h >/dev/null 2>&1
58+
then
59+
mise exec -- lefthook "$@"
60+
elif devbox run lefthook -h >/dev/null 2>&1
5261
then
53-
npx lefthook "$@"
62+
devbox run lefthook "$@"
5463
else
5564
echo "Can't find lefthook in PATH"
5665
fi

0 commit comments

Comments
 (0)