Skip to content

Commit a021352

Browse files
authored
Revert "ci: optimize tester builds with turbo cache (#181)" (#183)
This reverts commit 65fee19.
1 parent 3d256f7 commit a021352

File tree

1 file changed

+15
-58
lines changed

1 file changed

+15
-58
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,21 @@ jobs:
3333
tester-android:
3434
name: Integrated tester Android App
3535
runs-on: ubuntu-latest
36-
env:
37-
TURBO_CACHE_DIR: .turbo/android
36+
needs: build-lint
3837

3938
steps:
4039
- name: Checkout
4140
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
4241

42+
- name: Validate Gradle Wrapper
43+
uses: gradle/actions/wrapper-validation@6f229686ee4375cc4a86b2514c89bac4930e82c4 # v5
44+
45+
- name: Setup Java
46+
uses: actions/setup-java@5d7b2146334bacf88728daaa70414a99f5164e0f # v5
47+
with:
48+
distribution: 'zulu'
49+
java-version: '17'
50+
4351
- name: Setup Node.js
4452
uses: actions/setup-node@65d868f8d4d85d7d4abb7de0875cde3fcc8798f5 # v6
4553
with:
@@ -52,35 +60,7 @@ jobs:
5260
- name: Build packages
5361
run: yarn build
5462

55-
- name: Cache turborepo for Android
56-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
57-
with:
58-
path: ${{ env.TURBO_CACHE_DIR }}
59-
key: ${{ runner.os }}-turborepo-android-${{ hashFiles('yarn.lock') }}
60-
restore-keys: |
61-
${{ runner.os }}-turborepo-android-
62-
63-
- name: Check turborepo cache for Android
64-
run: |
65-
TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run build:tester-integrated:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:tester-integrated:android').cache.status")
66-
67-
if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
68-
echo "turbo_cache_hit=1" >> $GITHUB_ENV
69-
fi
70-
71-
- name: Validate Gradle Wrapper
72-
if: env.turbo_cache_hit != 1
73-
uses: gradle/actions/wrapper-validation@6f229686ee4375cc4a86b2514c89bac4930e82c4 # v5
74-
75-
- name: Setup Java
76-
if: env.turbo_cache_hit != 1
77-
uses: actions/setup-java@5d7b2146334bacf88728daaa70414a99f5164e0f # v5
78-
with:
79-
distribution: 'zulu'
80-
java-version: '17'
81-
8263
- name: Restore android build cache
83-
if: env.turbo_cache_hit != 1
8464
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
8565
with:
8666
path: |
@@ -91,8 +71,7 @@ jobs:
9171
restore-keys: |
9272
${{ runner.os }}-tester-android-build-
9373
94-
- name: Restore Gradle cache
95-
if: env.turbo_cache_hit != 1
74+
- name: Resture Gradle cache
9675
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
9776
with:
9877
path: |
@@ -103,16 +82,12 @@ jobs:
10382
${{ runner.os }}-tester-integrated-android-gradle-
10483
10584
- name: Build integrated Android tester app
106-
env:
107-
JAVA_OPTS: '-XX:MaxHeapSize=6g'
108-
run: |
109-
yarn turbo run build:tester-integrated:android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
85+
run: yarn run build:tester-integrated:android
11086

11187
tester-ios:
11288
name: Integrated tester iOS App
113-
runs-on: macos-15
114-
env:
115-
TURBO_CACHE_DIR: .turbo/ios
89+
runs-on: macos-latest
90+
needs: build-lint
11691

11792
steps:
11893
- name: Checkout
@@ -141,24 +116,7 @@ jobs:
141116
- name: Build packages
142117
run: yarn build
143118

144-
- name: Cache turborepo for iOS
145-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
146-
with:
147-
path: ${{ env.TURBO_CACHE_DIR }}
148-
key: ${{ runner.os }}-turborepo-ios-${{ hashFiles('yarn.lock') }}
149-
restore-keys: |
150-
${{ runner.os }}-turborepo-ios-
151-
152-
- name: Check turborepo cache for iOS
153-
run: |
154-
TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run build:tester-integrated:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:tester-integrated:ios').cache.status")
155-
156-
if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
157-
echo "turbo_cache_hit=1" >> $GITHUB_ENV
158-
fi
159-
160119
- name: Restore Pods cache
161-
if: env.turbo_cache_hit != 1
162120
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
163121
with:
164122
path: |
@@ -168,11 +126,10 @@ jobs:
168126
${{ runner.os }}-tester-ios-pods-
169127
170128
- name: Install pods
171-
if: env.turbo_cache_hit != 1
172129
run: |
173130
cd apps/TesterIntegrated/swift
174131
pod install
175132
176133
- name: Build integrated iOS tester app
177134
run: |
178-
yarn turbo run build:tester-integrated:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
135+
yarn run build:tester-integrated:ios

0 commit comments

Comments
 (0)