Skip to content

Commit ce78a30

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

File tree

3 files changed

+76
-67
lines changed

3 files changed

+76
-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: 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)
@@ -77,9 +80,9 @@ jobs:
7780
7881
- name: Prepare Debug Artifacts
7982
run: |
80-
scripts/prepare-sdk-armv7hf.sh src/out/linux_debug_$arch $PWD/src/build/linux/$target_sysroot
83+
scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_debug_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
8184
82-
tar czfhv $tag_debug.tar.gz src/out/linux_debug_$arch/engine-sdk/
85+
tar czfhv $tag_debug.tar.gz flutter/engine/src/out/linux_debug_$arch/engine-sdk/
8386
8487
sha256sum -b $tag_debug.tar.gz > $tag_debug.tar.gz.sha256
8588
@@ -104,10 +107,10 @@ jobs:
104107
gh release edit "$tag_debug" --draft=false
105108
106109
- name: Build Debug Unoptimized
107-
working-directory: src
110+
working-directory: flutter/engine/src
108111
run: |
109-
export PATH=$PATH:$PWD/../depot_tools
110-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
112+
export PATH=$PATH:$PWD/../../../depot_tools
113+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
111114
CLANG_ROOT=$(find -iname clang++)
112115
CLANG_ROOT=$(dirname $CLANG_ROOT)
113116
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -127,9 +130,9 @@ jobs:
127130
128131
- name: Prepare Debug Unoptimized Artifacts
129132
run: |
130-
scripts/prepare-sdk-armv7hf.sh src/out/linux_debug_unopt_$arch $PWD/src/build/linux/$target_sysroot
133+
scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_debug_unopt_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
131134
132-
tar czfhv $tag_debug_unopt.tar.gz src/out/linux_debug_unopt_$arch/engine-sdk/
135+
tar czfhv $tag_debug_unopt.tar.gz flutter/engine/src/out/linux_debug_unopt_$arch/engine-sdk/
133136
134137
sha256sum -b $tag_debug_unopt.tar.gz > $tag_debug_unopt.tar.gz.sha256
135138
@@ -154,10 +157,10 @@ jobs:
154157
gh release edit "$tag_debug_unopt" --draft=false
155158
156159
- name: Build Release
157-
working-directory: src
160+
working-directory: flutter/engine/src
158161
run: |
159-
export PATH=$PATH:$PWD/../depot_tools
160-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
162+
export PATH=$PATH:$PWD/../../../depot_tools
163+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
161164
CLANG_ROOT=$(find -iname clang++)
162165
CLANG_ROOT=$(dirname $CLANG_ROOT)
163166
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -177,9 +180,9 @@ jobs:
177180
178181
- name: Prepare Release Artifacts
179182
run: |
180-
scripts/prepare-sdk-armv7hf.sh src/out/linux_release_$arch $PWD/src/build/linux/$target_sysroot
183+
scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_release_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
181184
182-
tar czfhv $tag_release.tar.gz src/out/linux_release_$arch/engine-sdk/
185+
tar czfhv $tag_release.tar.gz flutter/engine/src/out/linux_release_$arch/engine-sdk/
183186
184187
sha256sum -b $tag_release.tar.gz > $tag_release.tar.gz.sha256
185188
@@ -204,10 +207,10 @@ jobs:
204207
gh release edit "$tag_release" --draft=false
205208
206209
- name: Build Profile
207-
working-directory: src
210+
working-directory: flutter/engine/src
208211
run: |
209-
export PATH=$PATH:$PWD/../depot_tools
210-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
212+
export PATH=$PATH:$PWD/../../../depot_tools
213+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
211214
CLANG_ROOT=$(find -iname clang++)
212215
CLANG_ROOT=$(dirname $CLANG_ROOT)
213216
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -226,9 +229,9 @@ jobs:
226229
227230
- name: Prepare Profile Artifacts
228231
run: |
229-
scripts/prepare-sdk-armv7hf.sh src/out/linux_profile_$arch $PWD/src/build/linux/debian_sid_arm-sysroot
232+
scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_profile_$arch $PWD/flutter/engine/src/build/linux/debian_sid_arm-sysroot
230233
231-
tar czfhv $tag_profile.tar.gz src/out/linux_profile_$arch/engine-sdk/
234+
tar czfhv $tag_profile.tar.gz flutter/engine/src/out/linux_profile_$arch/engine-sdk/
232235
233236
sha256sum -b $tag_profile.tar.gz > $tag_profile.tar.gz.sha256
234237

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

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,22 @@ 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+
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":""}]'
48+
gclient sync --force --shallow --no-history -R -D --revision ${{ inputs.SRCREV }} -j$(nproc) -v
49+
popd
4750
4851
PATCH_DIR=$PWD/patches
4952
50-
cd src
53+
cd flutter/engine/src
5154
git apply $PATCH_DIR/0001-clang-toolchain.patch
5255
5356
- name: Build Debug
54-
working-directory: src
57+
working-directory: flutter/engine/src
5558
run: |
56-
export PATH=$PATH:$PWD/../depot_tools
57-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
59+
export PATH=$PATH:$PWD/../../../depot_tools
60+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
5861
CLANG_ROOT=$(find -iname clang++)
5962
CLANG_ROOT=$(dirname $CLANG_ROOT)
6063
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -73,9 +76,9 @@ jobs:
7376
7477
- name: Prepare Debug Artifacts
7578
run: |
76-
scripts/prepare-sdk-x86-64.sh src/out/linux_debug_$arch $PWD/src/build/linux/$target_sysroot
79+
scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_debug_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
7780
78-
tar czfhv $tag_debug.tar.gz src/out/linux_debug_$arch/engine-sdk/
81+
tar czfhv $tag_debug.tar.gz flutter/engine/src/out/linux_debug_$arch/engine-sdk/
7982
8083
sha256sum -b $tag_debug.tar.gz > $tag_debug.tar.gz.sha256
8184
@@ -100,10 +103,10 @@ jobs:
100103
gh release edit "$tag_debug" --draft=false
101104
102105
- name: Build Debug Unoptimized
103-
working-directory: src
106+
working-directory: flutter/engine/src
104107
run: |
105-
export PATH=$PATH:$PWD/../depot_tools
106-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
108+
export PATH=$PATH:$PWD/../../../depot_tools
109+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
107110
CLANG_ROOT=$(find -iname clang++)
108111
CLANG_ROOT=$(dirname $CLANG_ROOT)
109112
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -123,9 +126,9 @@ jobs:
123126
124127
- name: Prepare Debug Unoptimized Artifacts
125128
run: |
126-
scripts/prepare-sdk-x86-64.sh src/out/linux_debug_unopt_$arch $PWD/src/build/linux/$target_sysroot
129+
scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_debug_unopt_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
127130
128-
tar czfhv $tag_debug_unopt.tar.gz src/out/linux_debug_unopt_$arch/engine-sdk/
131+
tar czfhv $tag_debug_unopt.tar.gz flutter/engine/src/out/linux_debug_unopt_$arch/engine-sdk/
129132
130133
sha256sum -b $tag_debug_unopt.tar.gz > $tag_debug_unopt.tar.gz.sha256
131134
@@ -150,10 +153,10 @@ jobs:
150153
gh release edit "$tag_debug_unopt" --draft=false
151154
152155
- name: Build Release
153-
working-directory: src
156+
working-directory: flutter/engine/src
154157
run: |
155-
export PATH=$PATH:$PWD/../depot_tools
156-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
158+
export PATH=$PATH:$PWD/../../../depot_tools
159+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
157160
CLANG_ROOT=$(find -iname clang++)
158161
CLANG_ROOT=$(dirname $CLANG_ROOT)
159162
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -172,9 +175,9 @@ jobs:
172175
173176
- name: Prepare Release Artifacts
174177
run: |
175-
scripts/prepare-sdk-x86-64.sh src/out/linux_release_$arch $PWD/src/build/linux/$target_sysroot
178+
scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_release_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
176179
177-
tar czfhv $tag_release.tar.gz src/out/linux_release_$arch/engine-sdk/
180+
tar czfhv $tag_release.tar.gz flutter/engine/src/out/linux_release_$arch/engine-sdk/
178181
179182
sha256sum -b $tag_release.tar.gz > $tag_release.tar.gz.sha256
180183
@@ -199,10 +202,10 @@ jobs:
199202
gh release edit "$tag_release" --draft=false
200203
201204
- name: Build Profile
202-
working-directory: src
205+
working-directory: flutter/engine/src
203206
run: |
204-
export PATH=$PATH:$PWD/../depot_tools
205-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
207+
export PATH=$PATH:$PWD/../../../depot_tools
208+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
206209
CLANG_ROOT=$(find -iname clang++)
207210
CLANG_ROOT=$(dirname $CLANG_ROOT)
208211
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -221,9 +224,9 @@ jobs:
221224
222225
- name: Prepare Profile Artifacts
223226
run: |
224-
scripts/prepare-sdk-x86-64.sh src/out/linux_profile_$arch $PWD/src/build/linux/$target_sysroot
227+
scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_profile_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
225228
226-
tar czfhv $tag_profile.tar.gz src/out/linux_profile_$arch/engine-sdk/
229+
tar czfhv $tag_profile.tar.gz flutter/engine/src/out/linux_profile_$arch/engine-sdk/
227230
228231
sha256sum -b $tag_profile.tar.gz > $tag_profile.tar.gz.sha256
229232

0 commit comments

Comments
 (0)