Skip to content

Commit 5bd2495

Browse files
jwinarskejwinarske
authored
Merge pull request #14 from meta-flutter/jw/clang_x64
Add missing clang_x64 folder
2 parents 1370ff3 + 24dca40 commit 5bd2495

File tree

8 files changed

+117
-221
lines changed

8 files changed

+117
-221
lines changed

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

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
linux-arm64:
1717
runs-on: [self-hosted, linux, x64]
1818
env:
19-
arch: arm64
19+
arch: arm64
2020
linux_cpu: arm64
2121
target_triple: aarch64-unknown-linux-gnu
2222
target_sysroot: debian_sid_arm64-sysroot
@@ -90,15 +90,16 @@ jobs:
9090
with:
9191
name: engine-sdk-debug
9292
path: |
93-
$tag_debug.tar.gz
94-
$tag_debug.tar.gz.sha256
93+
linux-engine-sdk-debug-arm64-${{ inputs.srcrev }}.tar.gz
94+
linux-engine-sdk-debug-arm64-${{ inputs.srcrev }}.tar.gz.sha256
9595
9696
- name: Release - Debug Release
9797
if: ${{ inputs.release == 'true' }}
9898
env:
9999
GH_TOKEN: ${{ github.token }}
100100
GH_REPO: ${{ github.repository }}
101101
run: |
102+
gh release delete "$tag_debug" --cleanup-tag -y |true
102103
gh release create --draft "$tag_debug" --title "$tag_debug" --notes "$notes_debug"
103104
gh release upload "$tag_debug" "$tag_debug.tar.gz" "$tag_debug.tar.gz.sha256"
104105
gh release edit "$tag_debug" --draft=false
@@ -130,35 +131,25 @@ jobs:
130131
scripts/prepare-sdk-$arch.sh src/out/linux_debug_unopt_$arch $PWD/src/build/linux/$target_sysroot
131132
132133
tar czfhv $tag_debug_unopt.tar.gz src/out/linux_debug_unopt_$arch/engine-sdk/
133-
tar czfhv $tag_debug_unopt-symbols.tar.gz src/out/linux_debug_unopt_$arch/.debug/
134134
135135
sha256sum -b $tag_debug_unopt.tar.gz > $tag_debug_unopt.tar.gz.sha256
136-
sha256sum -b $tag_debug_unopt-symbols.tar.gz > $tag_debug_unopt-symbols.tar.gz.sha256
137136
138137
- name: Publish Debug Unoptimized
139138
if: ${{ inputs.release != 'true' }}
140139
uses: actions/upload-artifact@v4
141140
with:
142141
name: engine-sdk-debug-unoptimized
143142
path: |
144-
$tag_debug_unopt.tar.gz
145-
$tag_debug_unopt.tar.gz.sha256
146-
147-
- name: Publish Debug Unoptimized Symbols
148-
if: ${{ inputs.release != 'true' }}
149-
uses: actions/upload-artifact@v4
150-
with:
151-
name: engine-sdk-debug-unoptimized-symbols
152-
path: |
153-
$tag_debug_unopt-symbols.tar.gz
154-
$tag_debug_unopt-symbols.tar.gz.sha256
143+
linux-engine-sdk-debug-unopt-arm64-${{ inputs.srcrev }}.tar.gz
144+
linux-engine-sdk-debug-unopt-arm64-${{ inputs.srcrev }}.tar.gz.sha256
155145
156146
- name: Release - Debug Unoptimized Release
157147
if: ${{ inputs.release == 'true' }}
158148
env:
159149
GH_TOKEN: ${{ github.token }}
160150
GH_REPO: ${{ github.repository }}
161151
run: |
152+
gh release delete "$tag_debug_unopt" --cleanup-tag -y |true
162153
gh release create --draft "$tag_debug_unopt" --title "$tag_debug_unopt" --notes "$notes_debug_unopt"
163154
gh release upload "$tag_debug_unopt" "$tag_debug_unopt.tar.gz" "$tag_debug_unopt.tar.gz.sha256"
164155
gh release edit "$tag_debug_unopt" --draft=false
@@ -198,15 +189,16 @@ jobs:
198189
with:
199190
name: engine-sdk-release
200191
path: |
201-
$tag_release.tar.gz
202-
$tag_release.tar.gz.sha256
192+
linux-engine-sdk-release-arm64-${{ inputs.srcrev }}.tar.gz
193+
linux-engine-sdk-release-arm64-${{ inputs.srcrev }}.tar.gz.sha256
203194
204195
- name: Release - Publish Release
205196
if: ${{ inputs.release == 'true' }}
206197
env:
207198
GH_TOKEN: ${{ github.token }}
208199
GH_REPO: ${{ github.repository }}
209200
run: |
201+
gh release delete "$tag_release" --cleanup-tag -y |true
210202
gh release create --draft "$tag_release" --title "$tag_release" --notes "$notes_release"
211203
gh release upload "$tag_release" "$tag_release.tar.gz" "$tag_release.tar.gz.sha256"
212204
gh release edit "$tag_release" --draft=false
@@ -246,15 +238,16 @@ jobs:
246238
with:
247239
name: engine-sdk-profile
248240
path: |
249-
$tag_profile.tar.gz
250-
$tag_profile.tar.gz.sha256
241+
linux-engine-sdk-profile-arm64-${{ inputs.srcrev }}.tar.gz
242+
linux-engine-sdk-profile-arm64-${{ inputs.srcrev }}.tar.gz.sha256
251243
252244
- name: Release - Publish Profile
253245
if: ${{ inputs.release == 'true' }}
254246
env:
255247
GH_TOKEN: ${{ github.token }}
256248
GH_REPO: ${{ github.repository }}
257249
run: |
250+
gh release delete "$tag_profile" --cleanup-tag -y |true
258251
gh release create --draft "$tag_profile" --title "$tag_profile" --notes "$notes_profile"
259252
gh release upload "$tag_profile" "$tag_profile.tar.gz" "$tag_profile.tar.gz.sha256"
260253
gh release edit "$tag_profile" --draft=false

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

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
linux-armv7hf:
1717
runs-on: [self-hosted, linux, x64]
1818
env:
19-
arch: arm
19+
arch: arm
2020
linux_cpu: arm --arm-float-abi hard
2121
target_triple: armv7-unknown-linux-gnueabihf
2222
target_sysroot: debian_sid_arm-sysroot
@@ -91,15 +91,16 @@ jobs:
9191
with:
9292
name: engine-sdk-debug
9393
path: |
94-
$tag_debug.tar.gz
95-
$tag_debug.tar.gz.sha256
94+
linux-engine-sdk-debug-armv7hf-${{ inputs.srcrev }}.tar.gz
95+
linux-engine-sdk-debug-armv7hf-${{ inputs.srcrev }}.tar.gz.sha256
9696
9797
- name: Release - Debug Release
9898
if: ${{ inputs.release == 'true' }}
9999
env:
100100
GH_TOKEN: ${{ github.token }}
101101
GH_REPO: ${{ github.repository }}
102102
run: |
103+
gh release delete "$tag_debug" --cleanup-tag -y |true
103104
gh release create --draft "$tag_debug" --title "$tag_debug" --notes "$notes_debug"
104105
gh release upload "$tag_debug" "$tag_debug.tar.gz" "$tag_debug.tar.gz.sha256"
105106
gh release edit "$tag_debug" --draft=false
@@ -131,35 +132,25 @@ jobs:
131132
scripts/prepare-sdk-armv7hf.sh src/out/linux_debug_unopt_$arch $PWD/src/build/linux/$target_sysroot
132133
133134
tar czfhv $tag_debug_unopt.tar.gz src/out/linux_debug_unopt_$arch/engine-sdk/
134-
tar czfhv $tag_debug_unopt-symbols.tar.gz src/out/linux_debug_unopt_$arch/.debug/
135135
136136
sha256sum -b $tag_debug_unopt.tar.gz > $tag_debug_unopt.tar.gz.sha256
137-
sha256sum -b $tag_debug_unopt-symbols.tar.gz > $tag_debug_unopt-symbols.tar.gz.sha256
138137
139138
- name: Publish Debug Unoptimized
140139
if: ${{ inputs.release != 'true' }}
141140
uses: actions/upload-artifact@v4
142141
with:
143142
name: engine-sdk-debug-unoptimized
144143
path: |
145-
$tag_debug_unopt.tar.gz
146-
$tag_debug_unopt.tar.gz.sha256
147-
148-
- name: Publish Debug Unoptimized Symbols
149-
if: ${{ inputs.release != 'true' }}
150-
uses: actions/upload-artifact@v4
151-
with:
152-
name: engine-sdk-debug-unoptimized-symbols
153-
path: |
154-
$tag_debug_unopt-symbols.tar.gz
155-
$tag_debug_unopt-symbols.tar.gz.sha256
144+
linux-engine-sdk-debug-unopt-armv7hf-${{ inputs.srcrev }}.tar.gz
145+
linux-engine-sdk-debug-unopt-armv7hf-${{ inputs.srcrev }}.tar.gz.sha256
156146
157147
- name: Release - Debug Unoptimized Release
158148
if: ${{ inputs.release == 'true' }}
159149
env:
160150
GH_TOKEN: ${{ github.token }}
161151
GH_REPO: ${{ github.repository }}
162152
run: |
153+
gh release delete "$tag_debug_unopt" --cleanup-tag -y |true
163154
gh release create --draft "$tag_debug_unopt" --title "$tag_debug_unopt" --notes "$notes_debug_unopt"
164155
gh release upload "$tag_debug_unopt" "$tag_debug_unopt.tar.gz" "$tag_debug_unopt.tar.gz.sha256"
165156
gh release edit "$tag_debug_unopt" --draft=false
@@ -200,15 +191,16 @@ jobs:
200191
with:
201192
name: engine-sdk-release
202193
path: |
203-
$tag_release.tar.gz
204-
$tag_release.tar.gz.sha256
194+
linux-engine-sdk-release-armv7hf-${{ inputs.srcrev }}.tar.gz
195+
linux-engine-sdk-release-armv7hf-${{ inputs.srcrev }}.tar.gz.sha256
205196
206197
- name: Release - Publish Release
207198
if: ${{ inputs.release == 'true' }}
208199
env:
209200
GH_TOKEN: ${{ github.token }}
210201
GH_REPO: ${{ github.repository }}
211202
run: |
203+
gh release delete "$tag_release" --cleanup-tag -y |true
212204
gh release create --draft "$tag_release" --title "$tag_release" --notes "$notes_release"
213205
gh release upload "$tag_release" "$tag_release.tar.gz" "$tag_release.tar.gz.sha256"
214206
gh release edit "$tag_release" --draft=false
@@ -248,15 +240,16 @@ jobs:
248240
with:
249241
name: engine-sdk-profile
250242
path: |
251-
$tag_profile.tar.gz
252-
$tag_profile.tar.gz.sha256
243+
linux-engine-sdk-profile-armv7hf-${{ inputs.srcrev }}.tar.gz
244+
linux-engine-sdk-profile-armv7hf-${{ inputs.srcrev }}.tar.gz.sha256
253245
254246
- name: Release - Publish Profile
255247
if: ${{ inputs.release == 'true' }}
256248
env:
257249
GH_TOKEN: ${{ github.token }}
258250
GH_REPO: ${{ github.repository }}
259251
run: |
252+
gh release delete "$tag_profile" --cleanup-tag -y |true
260253
gh release create --draft "$tag_profile" --title "$tag_profile" --notes "$notes_profile"
261254
gh release upload "$tag_profile" "$tag_profile.tar.gz" "$tag_profile.tar.gz.sha256"
262255
gh release edit "$tag_profile" --draft=false

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

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
linux-x86_64:
1717
runs-on: [self-hosted, linux, x64]
1818
env:
19-
arch: x64
19+
arch: x64
2020
linux_cpu: x64
2121
target_triple: x86_64-unknown-linux-gnu
2222
target_sysroot: debian_sid_amd64-sysroot
@@ -87,15 +87,16 @@ jobs:
8787
with:
8888
name: engine-sdk-debug
8989
path: |
90-
$tag_debug.tar.gz
91-
$tag_debug.tar.gz.sha256
90+
linux-engine-sdk-debug-x86_64-${{ inputs.srcrev }}.tar.gz
91+
linux-engine-sdk-debug-x86_64-${{ inputs.srcrev }}.tar.gz.sha256
9292
9393
- name: Release - Debug Release
9494
if: ${{ inputs.release == 'true' }}
9595
env:
9696
GH_TOKEN: ${{ github.token }}
9797
GH_REPO: ${{ github.repository }}
9898
run: |
99+
gh release delete "$tag_debug" --cleanup-tag -y |true
99100
gh release create --draft "$tag_debug" --title "$tag_debug" --notes "$notes_debug"
100101
gh release upload "$tag_debug" "$tag_debug.tar.gz" "$tag_debug.tar.gz.sha256"
101102
gh release edit "$tag_debug" --draft=false
@@ -127,35 +128,25 @@ jobs:
127128
scripts/prepare-sdk-x86-64.sh src/out/linux_debug_unopt_$arch $PWD/src/build/linux/$target_sysroot
128129
129130
tar czfhv $tag_debug_unopt.tar.gz src/out/linux_debug_unopt_$arch/engine-sdk/
130-
tar czfhv $tag_debug_unopt-symbols.tar.gz src/out/linux_debug_unopt_$arch/.debug/
131131
132132
sha256sum -b $tag_debug_unopt.tar.gz > $tag_debug_unopt.tar.gz.sha256
133-
sha256sum -b $tag_debug_unopt-symbols.tar.gz > $tag_debug_unopt-symbols.tar.gz.sha256
134133
135134
- name: Publish Debug Unoptimized
136135
if: ${{ inputs.release != 'true' }}
137136
uses: actions/upload-artifact@v4
138137
with:
139138
name: engine-sdk-debug-unoptimized
140139
path: |
141-
$tag_debug_unopt.tar.gz
142-
$tag_debug_unopt.tar.gz.sha256
143-
144-
- name: Publish Debug Unoptimized Symbols
145-
if: ${{ inputs.release != 'true' }}
146-
uses: actions/upload-artifact@v4
147-
with:
148-
name: engine-sdk-debug-unoptimized-symbols
149-
path: |
150-
$tag_debug_unopt-symbols.tar.gz
151-
$tag_debug_unopt-symbols.tar.gz.sha256
140+
linux-engine-sdk-debug-unopt-x86_64-${{ inputs.srcrev }}.tar.gz
141+
linux-engine-sdk-debug-unopt-x86_64-${{ inputs.srcrev }}.tar.gz.sha256
152142
153143
- name: Release - Debug Unoptimized Release
154144
if: ${{ inputs.release == 'true' }}
155145
env:
156146
GH_TOKEN: ${{ github.token }}
157147
GH_REPO: ${{ github.repository }}
158148
run: |
149+
gh release delete "$tag_debug_unopt" --cleanup-tag -y |true
159150
gh release create --draft "$tag_debug_unopt" --title "$tag_debug_unopt" --notes "$notes_debug_unopt"
160151
gh release upload "$tag_debug_unopt" "$tag_debug_unopt.tar.gz" "$tag_debug_unopt.tar.gz.sha256"
161152
gh release edit "$tag_debug_unopt" --draft=false
@@ -195,15 +186,16 @@ jobs:
195186
with:
196187
name: engine-sdk-release
197188
path: |
198-
$tag_release.tar.gz
199-
$tag_release.tar.gz.sha256
189+
linux-engine-sdk-release-x86_64-${{ inputs.srcrev }}.tar.gz
190+
linux-engine-sdk-release-x86_64-${{ inputs.srcrev }}.tar.gz.sha256
200191
201192
- name: Release - Publish Release
202193
if: ${{ inputs.release == 'true' }}
203194
env:
204195
GH_TOKEN: ${{ github.token }}
205196
GH_REPO: ${{ github.repository }}
206197
run: |
198+
gh release delete "$tag_release" --cleanup-tag -y |true
207199
gh release create --draft "$tag_release" --title "$tag_release" --notes "$notes_release"
208200
gh release upload "$tag_release" "$tag_release.tar.gz" "$tag_release.tar.gz.sha256"
209201
gh release edit "$tag_release" --draft=false
@@ -243,15 +235,16 @@ jobs:
243235
with:
244236
name: engine-sdk-profile
245237
path: |
246-
$tag_profile.tar.gz
247-
$tag_profile.tar.gz.sha256
238+
linux-engine-sdk-profile-x86_64-${{ inputs.srcrev }}.tar.gz
239+
linux-engine-sdk-profile-x86_64-${{ inputs.srcrev }}.tar.gz.sha256
248240
249241
- name: Release - Publish Profile
250242
if: ${{ inputs.release == 'true' }}
251243
env:
252244
GH_TOKEN: ${{ github.token }}
253245
GH_REPO: ${{ github.repository }}
254246
run: |
247+
gh release delete "$tag_profile" --cleanup-tag -y |true
255248
gh release create --draft "$tag_profile" --title "$tag_profile" --notes "$notes_profile"
256249
gh release upload "$tag_profile" "$tag_profile.tar.gz" "$tag_profile.tar.gz.sha256"
257250
gh release edit "$tag_profile" --draft=false

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright [yyyy] [name of copyright owner]
189+
Copyright 2024 Joel Winarske
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ Never use a binary build artifact from a server that you cannot validate the exp
2828

2929
When running binaries on your Linux host, if it fails to execute due to interpreter error you can use the following pattern:
3030
```
31-
unshare -mr chroot `pwd`/engine-sdk /usr/bin/gen_snapshot --version
32-
Dart SDK version: 3.6.0-164.0.dev (dev) (Tue Aug 20 13:05:46 2024 -0700) on "linux_x64"
31+
unshare -mr chroot $(pwd)/engine-sdk/clang_x64 /bin/gen_snapshot --version
32+
Dart SDK version: 3.5.2 (stable) (Wed Aug 28 10:01:20 2024 +0000) on "linux_x64"
3333
```

0 commit comments

Comments
 (0)