Skip to content

Commit 5375c12

Browse files
jwinarskejwinarske
committed
Mono Repo support
-3.29.0+ Signed-off-by: Joel Winarske <[email protected]>
1 parent b210b94 commit 5375c12

File tree

3 files changed

+72
-67
lines changed

3 files changed

+72
-67
lines changed

‎.github/workflows/flutter-engine-arm64.yaml‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,25 @@ jobs:
4242
run: |
4343
export PATH=$PATH:$PWD/depot_tools
4444
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
45-
gclient config --spec 'solutions=[{"name":"src/flutter","url":"https://github.com/flutter/engine.git","deps_file":"DEPS","managed":False,"custom_deps":{},"custom_vars":{"download_android_deps":False,"download_windows_deps":False,"download_linux_deps":True}}]'
45+
git clone https://github.com/flutter/flutter.git
46+
pushd flutter
47+
gclient config --spec 'solutions=[{"managed":False,"name":".","url":"https://github.com/flutter/flutter.git","custom_deps":{},"custom_vars":{"download_android_deps":False,"download_windows_deps":False,"download_linux_deps":True},"deps_file":"DEPS","safesync_url":""}]'
4648
gclient sync --force --shallow --no-history -R -D --revision ${{ inputs.SRCREV }} -j$(nproc) -v
49+
popd
4750
4851
PATCH_DIR=$PWD/patches
4952
5053
# fetch sysroot
51-
cd src
54+
cd flutter/engine/src
5255
build/linux/sysroot_scripts/install-sysroot.py --arch=$arch
5356
5457
git apply $PATCH_DIR/0001-clang-toolchain.patch
5558
5659
- name: Build Debug
57-
working-directory: src
60+
working-directory: flutter/engine/src
5861
run: |
59-
export PATH=$PATH:$PWD/../depot_tools
60-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
62+
export PATH=$PATH:$PWD/../../../depot_tools
63+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
6164
CLANG_ROOT=$(find -iname clang++)
6265
CLANG_ROOT=$(dirname $CLANG_ROOT)
6366
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -76,9 +79,9 @@ jobs:
7679
7780
- name: Prepare Debug Artifacts
7881
run: |
79-
scripts/prepare-sdk-$arch.sh src/out/linux_debug_$arch $PWD/src/build/linux/$target_sysroot
82+
scripts/prepare-sdk-$arch.sh flutter/engine/src/out/linux_debug_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
8083
81-
tar czfhv $tag_debug.tar.gz src/out/linux_debug_$arch/engine-sdk/
84+
tar czfhv $tag_debug.tar.gz flutter/engine/src/out/linux_debug_$arch/engine-sdk/
8285
8386
sha256sum -b $tag_debug.tar.gz > $tag_debug.tar.gz.sha256
8487
@@ -103,10 +106,10 @@ jobs:
103106
gh release edit "$tag_debug" --draft=false
104107
105108
- name: Build Debug Unoptimized
106-
working-directory: src
109+
working-directory: flutter/engine/src
107110
run: |
108-
export PATH=$PATH:$PWD/../depot_tools
109-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
111+
export PATH=$PATH:$PWD/../../../depot_tools
112+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
110113
CLANG_ROOT=$(find -iname clang++)
111114
CLANG_ROOT=$(dirname $CLANG_ROOT)
112115
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -126,9 +129,9 @@ jobs:
126129
127130
- name: Prepare Debug Unoptimized Artifacts
128131
run: |
129-
scripts/prepare-sdk-$arch.sh src/out/linux_debug_unopt_$arch $PWD/src/build/linux/$target_sysroot
132+
scripts/prepare-sdk-$arch.sh flutter/engine/src/out/linux_debug_unopt_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
130133
131-
tar czfhv $tag_debug_unopt.tar.gz src/out/linux_debug_unopt_$arch/engine-sdk/
134+
tar czfhv $tag_debug_unopt.tar.gz flutter/engine/src/out/linux_debug_unopt_$arch/engine-sdk/
132135
133136
sha256sum -b $tag_debug_unopt.tar.gz > $tag_debug_unopt.tar.gz.sha256
134137
@@ -153,10 +156,10 @@ jobs:
153156
gh release edit "$tag_debug_unopt" --draft=false
154157
155158
- name: Build Release
156-
working-directory: src
159+
working-directory: flutter/engine/src
157160
run: |
158-
export PATH=$PATH:$PWD/../depot_tools
159-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
161+
export PATH=$PATH:$PWD/../../../depot_tools
162+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
160163
CLANG_ROOT=$(find -iname clang++)
161164
CLANG_ROOT=$(dirname $CLANG_ROOT)
162165
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -175,9 +178,9 @@ jobs:
175178
176179
- name: Prepare Release Artifacts
177180
run: |
178-
scripts/prepare-sdk-$arch.sh src/out/linux_release_$arch $PWD/src/build/linux/$target_sysroot
181+
scripts/prepare-sdk-$arch.sh flutter/engine/src/out/linux_release_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
179182
180-
tar czfhv $tag_release.tar.gz src/out/linux_release_$arch/engine-sdk/
183+
tar czfhv $tag_release.tar.gz flutter/engine/src/out/linux_release_$arch/engine-sdk/
181184
182185
sha256sum -b $tag_release.tar.gz > $tag_release.tar.gz.sha256
183186
@@ -202,10 +205,10 @@ jobs:
202205
gh release edit "$tag_release" --draft=false
203206
204207
- name: Build Profile
205-
working-directory: src
208+
working-directory: flutter/engine/src
206209
run: |
207-
export PATH=$PATH:$PWD/../depot_tools
208-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
210+
export PATH=$PATH:$PWD/../../../depot_tools
211+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
209212
CLANG_ROOT=$(find -iname clang++)
210213
CLANG_ROOT=$(dirname $CLANG_ROOT)
211214
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -224,9 +227,9 @@ jobs:
224227
225228
- name: Prepare Profile Artifacts
226229
run: |
227-
scripts/prepare-sdk-$arch.sh src/out/linux_profile_$arch $PWD/src/build/linux/$target_sysroot
230+
scripts/prepare-sdk-$arch.sh flutter/engine/src/out/linux_profile_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
228231
229-
tar czfhv $tag_profile.tar.gz src/out/linux_profile_$arch/engine-sdk/
232+
tar czfhv $tag_profile.tar.gz flutter/engine/src/out/linux_profile_$arch/engine-sdk/
230233
231234
sha256sum -b $tag_profile.tar.gz > $tag_profile.tar.gz.sha256
232235

‎.github/workflows/flutter-engine-armv7hf.yaml‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,23 @@ jobs:
4242
run: |
4343
export PATH=$PATH:$PWD/depot_tools
4444
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
45-
gclient config --spec 'solutions=[{"name":"src/flutter","url":"https://github.com/flutter/engine.git","deps_file":"DEPS","managed":False,"custom_deps":{},"custom_vars":{"download_android_deps":False,"download_windows_deps":False,"download_linux_deps":True}}]'
45+
git clone https://github.com/flutter/flutter.git
46+
gclient config --spec 'solutions=[{"path":"flutter","managed":False,"name":".","url":"https://github.com/flutter/flutter.git","custom_deps":{},"custom_vars":{"download_android_deps":False,"download_windows_deps":False,"download_linux_deps":True},"deps_file":"DEPS","safesync_url":""}]'
4647
gclient sync --force --shallow --no-history -R -D --revision ${{ inputs.SRCREV }} -j$(nproc) -v
4748
4849
PATCH_DIR=$PWD/patches
4950
5051
# fetch sysroot
51-
cd src
52+
cd flutter/engine/src
5253
build/linux/sysroot_scripts/install-sysroot.py --arch=$arch
5354
5455
git apply $PATCH_DIR/0001-clang-toolchain.patch
5556
5657
- name: Build Debug
57-
working-directory: src
58+
working-directory: flutter/engine/src
5859
run: |
59-
export PATH=$PATH:$PWD/../depot_tools
60-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
60+
export PATH=$PATH:$PWD/../../../depot_tools
61+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
6162
CLANG_ROOT=$(find -iname clang++)
6263
CLANG_ROOT=$(dirname $CLANG_ROOT)
6364
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -77,9 +78,9 @@ jobs:
7778
7879
- name: Prepare Debug Artifacts
7980
run: |
80-
scripts/prepare-sdk-armv7hf.sh src/out/linux_debug_$arch $PWD/src/build/linux/$target_sysroot
81+
scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_debug_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
8182
82-
tar czfhv $tag_debug.tar.gz src/out/linux_debug_$arch/engine-sdk/
83+
tar czfhv $tag_debug.tar.gz flutter/engine/src/out/linux_debug_$arch/engine-sdk/
8384
8485
sha256sum -b $tag_debug.tar.gz > $tag_debug.tar.gz.sha256
8586
@@ -104,10 +105,10 @@ jobs:
104105
gh release edit "$tag_debug" --draft=false
105106
106107
- name: Build Debug Unoptimized
107-
working-directory: src
108+
working-directory: flutter/engine/src
108109
run: |
109-
export PATH=$PATH:$PWD/../depot_tools
110-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
110+
export PATH=$PATH:$PWD/../../../depot_tools
111+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
111112
CLANG_ROOT=$(find -iname clang++)
112113
CLANG_ROOT=$(dirname $CLANG_ROOT)
113114
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -127,9 +128,9 @@ jobs:
127128
128129
- name: Prepare Debug Unoptimized Artifacts
129130
run: |
130-
scripts/prepare-sdk-armv7hf.sh src/out/linux_debug_unopt_$arch $PWD/src/build/linux/$target_sysroot
131+
scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_debug_unopt_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
131132
132-
tar czfhv $tag_debug_unopt.tar.gz src/out/linux_debug_unopt_$arch/engine-sdk/
133+
tar czfhv $tag_debug_unopt.tar.gz flutter/engine/src/out/linux_debug_unopt_$arch/engine-sdk/
133134
134135
sha256sum -b $tag_debug_unopt.tar.gz > $tag_debug_unopt.tar.gz.sha256
135136
@@ -154,10 +155,10 @@ jobs:
154155
gh release edit "$tag_debug_unopt" --draft=false
155156
156157
- name: Build Release
157-
working-directory: src
158+
working-directory: flutter/engine/src
158159
run: |
159-
export PATH=$PATH:$PWD/../depot_tools
160-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
160+
export PATH=$PATH:$PWD/../../../depot_tools
161+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
161162
CLANG_ROOT=$(find -iname clang++)
162163
CLANG_ROOT=$(dirname $CLANG_ROOT)
163164
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -177,9 +178,9 @@ jobs:
177178
178179
- name: Prepare Release Artifacts
179180
run: |
180-
scripts/prepare-sdk-armv7hf.sh src/out/linux_release_$arch $PWD/src/build/linux/$target_sysroot
181+
scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_release_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
181182
182-
tar czfhv $tag_release.tar.gz src/out/linux_release_$arch/engine-sdk/
183+
tar czfhv $tag_release.tar.gz flutter/engine/src/out/linux_release_$arch/engine-sdk/
183184
184185
sha256sum -b $tag_release.tar.gz > $tag_release.tar.gz.sha256
185186
@@ -204,10 +205,10 @@ jobs:
204205
gh release edit "$tag_release" --draft=false
205206
206207
- name: Build Profile
207-
working-directory: src
208+
working-directory: flutter/engine/src
208209
run: |
209-
export PATH=$PATH:$PWD/../depot_tools
210-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
210+
export PATH=$PATH:$PWD/../../../depot_tools
211+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
211212
CLANG_ROOT=$(find -iname clang++)
212213
CLANG_ROOT=$(dirname $CLANG_ROOT)
213214
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -226,9 +227,9 @@ jobs:
226227
227228
- name: Prepare Profile Artifacts
228229
run: |
229-
scripts/prepare-sdk-armv7hf.sh src/out/linux_profile_$arch $PWD/src/build/linux/debian_sid_arm-sysroot
230+
scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_profile_$arch $PWD/flutter/engine/src/build/linux/debian_sid_arm-sysroot
230231
231-
tar czfhv $tag_profile.tar.gz src/out/linux_profile_$arch/engine-sdk/
232+
tar czfhv $tag_profile.tar.gz flutter/engine/src/out/linux_profile_$arch/engine-sdk/
232233
233234
sha256sum -b $tag_profile.tar.gz > $tag_profile.tar.gz.sha256
234235

‎.github/workflows/flutter-engine-x86_64.yaml‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,20 @@ jobs:
4242
run: |
4343
export PATH=$PATH:$PWD/depot_tools
4444
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
45-
gclient config --spec 'solutions=[{"name":"src/flutter","url":"https://github.com/flutter/engine.git","deps_file":"DEPS","managed":False,"custom_deps":{},"custom_vars":{"download_android_deps":False,"download_windows_deps":False,"download_linux_deps":True}}]'
46-
gclient sync --force --shallow --no-history -R -D --revision ${{ inputs.srcrev }} -j$(nproc) -v
45+
git clone https://github.com/flutter/flutter.git
46+
gclient config --spec 'solutions=[{"path":"flutter","managed":False,"name":".","url":"https://github.com/flutter/flutter.git","custom_deps":{},"custom_vars":{"download_android_deps":False,"download_windows_deps":False,"download_linux_deps":True},"deps_file":"DEPS","safesync_url":""}]'
47+
gclient sync --force --shallow --no-history -R -D --revision ${{ inputs.SRCREV }} -j$(nproc) -v
4748
4849
PATCH_DIR=$PWD/patches
4950
50-
cd src
51+
cd flutter/engine/src
5152
git apply $PATCH_DIR/0001-clang-toolchain.patch
5253
5354
- name: Build Debug
54-
working-directory: src
55+
working-directory: flutter/engine/src
5556
run: |
56-
export PATH=$PATH:$PWD/../depot_tools
57-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
57+
export PATH=$PATH:$PWD/../../../depot_tools
58+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
5859
CLANG_ROOT=$(find -iname clang++)
5960
CLANG_ROOT=$(dirname $CLANG_ROOT)
6061
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -73,9 +74,9 @@ jobs:
7374
7475
- name: Prepare Debug Artifacts
7576
run: |
76-
scripts/prepare-sdk-x86-64.sh src/out/linux_debug_$arch $PWD/src/build/linux/$target_sysroot
77+
scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_debug_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
7778
78-
tar czfhv $tag_debug.tar.gz src/out/linux_debug_$arch/engine-sdk/
79+
tar czfhv $tag_debug.tar.gz flutter/engine/src/out/linux_debug_$arch/engine-sdk/
7980
8081
sha256sum -b $tag_debug.tar.gz > $tag_debug.tar.gz.sha256
8182
@@ -100,10 +101,10 @@ jobs:
100101
gh release edit "$tag_debug" --draft=false
101102
102103
- name: Build Debug Unoptimized
103-
working-directory: src
104+
working-directory: flutter/engine/src
104105
run: |
105-
export PATH=$PATH:$PWD/../depot_tools
106-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
106+
export PATH=$PATH:$PWD/../../../depot_tools
107+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
107108
CLANG_ROOT=$(find -iname clang++)
108109
CLANG_ROOT=$(dirname $CLANG_ROOT)
109110
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -123,9 +124,9 @@ jobs:
123124
124125
- name: Prepare Debug Unoptimized Artifacts
125126
run: |
126-
scripts/prepare-sdk-x86-64.sh src/out/linux_debug_unopt_$arch $PWD/src/build/linux/$target_sysroot
127+
scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_debug_unopt_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
127128
128-
tar czfhv $tag_debug_unopt.tar.gz src/out/linux_debug_unopt_$arch/engine-sdk/
129+
tar czfhv $tag_debug_unopt.tar.gz flutter/engine/src/out/linux_debug_unopt_$arch/engine-sdk/
129130
130131
sha256sum -b $tag_debug_unopt.tar.gz > $tag_debug_unopt.tar.gz.sha256
131132
@@ -150,10 +151,10 @@ jobs:
150151
gh release edit "$tag_debug_unopt" --draft=false
151152
152153
- name: Build Release
153-
working-directory: src
154+
working-directory: flutter/engine/src
154155
run: |
155-
export PATH=$PATH:$PWD/../depot_tools
156-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
156+
export PATH=$PATH:$PWD/../../../depot_tools
157+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
157158
CLANG_ROOT=$(find -iname clang++)
158159
CLANG_ROOT=$(dirname $CLANG_ROOT)
159160
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -172,9 +173,9 @@ jobs:
172173
173174
- name: Prepare Release Artifacts
174175
run: |
175-
scripts/prepare-sdk-x86-64.sh src/out/linux_release_$arch $PWD/src/build/linux/$target_sysroot
176+
scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_release_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
176177
177-
tar czfhv $tag_release.tar.gz src/out/linux_release_$arch/engine-sdk/
178+
tar czfhv $tag_release.tar.gz flutter/engine/src/out/linux_release_$arch/engine-sdk/
178179
179180
sha256sum -b $tag_release.tar.gz > $tag_release.tar.gz.sha256
180181
@@ -199,10 +200,10 @@ jobs:
199200
gh release edit "$tag_release" --draft=false
200201
201202
- name: Build Profile
202-
working-directory: src
203+
working-directory: flutter/engine/src
203204
run: |
204-
export PATH=$PATH:$PWD/../depot_tools
205-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
205+
export PATH=$PATH:$PWD/../../../depot_tools
206+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
206207
CLANG_ROOT=$(find -iname clang++)
207208
CLANG_ROOT=$(dirname $CLANG_ROOT)
208209
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -221,9 +222,9 @@ jobs:
221222
222223
- name: Prepare Profile Artifacts
223224
run: |
224-
scripts/prepare-sdk-x86-64.sh src/out/linux_profile_$arch $PWD/src/build/linux/$target_sysroot
225+
scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_profile_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
225226
226-
tar czfhv $tag_profile.tar.gz src/out/linux_profile_$arch/engine-sdk/
227+
tar czfhv $tag_profile.tar.gz flutter/engine/src/out/linux_profile_$arch/engine-sdk/
227228
228229
sha256sum -b $tag_profile.tar.gz > $tag_profile.tar.gz.sha256
229230

0 commit comments

Comments
 (0)