Skip to content

Commit 65ff8d9

Browse files
MarshallOfSoundMarshallOfSound
authored
build: store artifacts in simpler way (electron#29133)
1 parent 84cc72c commit 65ff8d9

File tree

1 file changed

+37
-62
lines changed

1 file changed

+37
-62
lines changed

‎.circleci/config.yml‎

Lines changed: 37 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -594,11 +594,6 @@ step-electron-dist-build: &step-electron-dist-build
594594
fi
595595
fi
596596
597-
step-electron-dist-store: &step-electron-dist-store
598-
store_artifacts:
599-
path: src/out/Default/dist.zip
600-
destination: dist.zip
601-
602597
step-electron-maybe-chromedriver-gn-gen: &step-electron-maybe-chromedriver-gn-gen
603598
run:
604599
name: chromedriver GN gen
@@ -627,28 +622,13 @@ step-electron-chromedriver-build: &step-electron-chromedriver-build
627622
cp out/chromedriver/chromedriver.zip out/Default
628623
fi
629624
630-
step-electron-chromedriver-store: &step-electron-chromedriver-store
631-
store_artifacts:
632-
path: src/out/Default/chromedriver.zip
633-
destination: chromedriver.zip
634-
635625
step-nodejs-headers-build: &step-nodejs-headers-build
636626
run:
637627
name: Build Node.js headers
638628
command: |
639629
cd src
640630
ninja -C out/Default third_party/electron_node:headers
641631
642-
step-nodejs-headers-store: &step-nodejs-headers-store
643-
store_artifacts:
644-
path: src/out/Default/gen/node_headers.tar.gz
645-
destination: node_headers.tar.gz
646-
647-
step-native-unittests-store: &step-native-unittests-store
648-
store_artifacts:
649-
path: src/out/Default/shell_browser_ui_unittests
650-
destination: shell_browser_ui_unittests
651-
652632
step-electron-publish: &step-electron-publish
653633
run:
654634
name: Publish Electron Dist
@@ -739,11 +719,6 @@ step-verify-ffmpeg: &step-verify-ffmpeg
739719
cd src
740720
python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
741721
742-
step-ffmpeg-store: &step-ffmpeg-store
743-
store_artifacts:
744-
path: src/out/ffmpeg/ffmpeg.zip
745-
destination: ffmpeg.zip
746-
747722
step-verify-mksnapshot: &step-verify-mksnapshot
748723
run:
749724
name: Verify mksnapshot
@@ -812,11 +787,6 @@ step-mksnapshot-build: &step-mksnapshot-build
812787
(cd out/Default; zip mksnapshot.zip mksnapshot_args gen/v8/embedded.S)
813788
fi
814789
815-
step-mksnapshot-store: &step-mksnapshot-store
816-
store_artifacts:
817-
path: src/out/Default/mksnapshot.zip
818-
destination: mksnapshot.zip
819-
820790
step-hunspell-build: &step-hunspell-build
821791
run:
822792
name: hunspell build
@@ -826,11 +796,6 @@ step-hunspell-build: &step-hunspell-build
826796
ninja -C out/Default electron:hunspell_dictionaries_zip -j $NUMBER_OF_NINJA_PROCESSES
827797
fi
828798
829-
step-hunspell-store: &step-hunspell-store
830-
store_artifacts:
831-
path: src/out/Default/hunspell_dictionaries.zip
832-
destination: hunspell_dictionaries.zip
833-
834799
step-maybe-generate-breakpad-symbols: &step-maybe-generate-breakpad-symbols
835800
run:
836801
name: Generate breakpad symbols
@@ -851,11 +816,6 @@ step-maybe-zip-symbols: &step-maybe-zip-symbols
851816
ninja -C out/Default electron:electron_version
852817
DELETE_DSYMS_AFTER_ZIP=1 electron/script/zip-symbols.py -b $BUILD_PATH
853818
854-
step-symbols-store: &step-symbols-store
855-
store_artifacts:
856-
path: src/out/Default/symbols.zip
857-
destination: symbols.zip
858-
859819
step-maybe-cross-arch-snapshot: &step-maybe-cross-arch-snapshot
860820
run:
861821
name: Generate cross arch snapshot (arm/arm64)
@@ -879,11 +839,6 @@ step-maybe-cross-arch-snapshot: &step-maybe-cross-arch-snapshot
879839
cp out/Default-mksnapshot-test/*.bin cross-arch-snapshots
880840
fi
881841
882-
step-maybe-cross-arch-snapshot-store: &step-maybe-cross-arch-snapshot-store
883-
store_artifacts:
884-
path: src/cross-arch-snapshots
885-
destination: cross-arch-snapshots
886-
887842
step-maybe-trigger-arm-test: &step-maybe-trigger-arm-test
888843
run:
889844
name: Trigger an arm test on VSTS if applicable
@@ -1364,6 +1319,39 @@ commands:
13641319
rm -rf src
13651320
mv /var/portal/src ./
13661321
fi
1322+
1323+
move_and_store_all_artifacts:
1324+
steps:
1325+
- run:
1326+
name: Move all generated artifacts to upload folder
1327+
command: |
1328+
rm -rf generated_artifacts
1329+
mkdir generated_artifacts
1330+
mv_if_exist() {
1331+
if [ -f "$1" ] || [ -d "$1" ]; then
1332+
echo Storing $1
1333+
mv $1 generated_artifacts
1334+
else
1335+
echo Skipping $1 - It is not present on disk
1336+
fi
1337+
}
1338+
mv_if_exist src/out/Default/dist.zip
1339+
mv_if_exist src/out/Default/shell_browser_ui_unittests
1340+
mv_if_exist src/out/Default/gen/node_headers.tar.gz
1341+
mv_if_exist src/out/Default/symbols.zip
1342+
mv_if_exist src/out/Default/mksnapshot.zip
1343+
mv_if_exist src/out/Default/chromedriver.zip
1344+
mv_if_exist src/out/ffmpeg/ffmpeg.zip
1345+
mv_if_exist src/out/Default/hunspell_dictionaries.zip
1346+
mv_if_exist src/cross-arch-snapshots
1347+
when: always
1348+
- store_artifacts:
1349+
path: generated_artifacts
1350+
destination: ./
1351+
- store_artifacts:
1352+
path: generated_artifacts/cross-arch-snapshots
1353+
destination: cross-arch-snapshots
1354+
13671355
checkout-from-cache:
13681356
steps:
13691357
- *step-checkout-electron
@@ -1512,40 +1500,32 @@ commands:
15121500
- *step-ninja-report
15131501
- *step-maybe-electron-dist-strip
15141502
- *step-electron-dist-build
1515-
- *step-electron-dist-store
15161503

15171504
# Native test targets
15181505
- *step-native-unittests-build
1519-
- *step-native-unittests-store
15201506

15211507
# Node.js headers
15221508
- *step-nodejs-headers-build
1523-
- *step-nodejs-headers-store
15241509

15251510
- *step-show-goma-stats
15261511

15271512
# mksnapshot
15281513
- *step-mksnapshot-build
1529-
- *step-mksnapshot-store
15301514
- *step-maybe-cross-arch-snapshot
1531-
- *step-maybe-cross-arch-snapshot-store
15321515

15331516
# chromedriver
15341517
- *step-electron-maybe-chromedriver-gn-gen
15351518
- *step-electron-chromedriver-build
1536-
- *step-electron-chromedriver-store
15371519

15381520
- when:
15391521
condition: << parameters.build-nonproprietary-ffmpeg >>
15401522
steps:
15411523
# ffmpeg
15421524
- *step-ffmpeg-gn-gen
15431525
- *step-ffmpeg-build
1544-
- *step-ffmpeg-store
15451526

15461527
# hunspell
15471528
- *step-hunspell-build
1548-
- *step-hunspell-store
15491529

15501530
# Save all data needed for a further tests run.
15511531
- when:
@@ -1558,7 +1538,6 @@ commands:
15581538
steps:
15591539
- *step-maybe-generate-breakpad-symbols
15601540
- *step-maybe-zip-symbols
1561-
- *step-symbols-store
15621541

15631542
- when:
15641543
condition: << parameters.build >>
@@ -1580,6 +1559,8 @@ commands:
15801559
steps:
15811560
- *step-save-out-cache
15821561

1562+
- move_and_store_all_artifacts
1563+
15831564
# Trigger tests on arm hardware if needed
15841565
- *step-maybe-trigger-arm-test
15851566

@@ -1624,37 +1605,31 @@ commands:
16241605
- *step-maybe-generate-breakpad-symbols
16251606
- *step-maybe-electron-dist-strip
16261607
- *step-electron-dist-build
1627-
- *step-electron-dist-store
16281608
- *step-maybe-zip-symbols
1629-
- *step-symbols-store
16301609

16311610
# mksnapshot
16321611
- *step-mksnapshot-build
1633-
- *step-mksnapshot-store
16341612

16351613
# chromedriver
16361614
- *step-electron-maybe-chromedriver-gn-gen
16371615
- *step-electron-chromedriver-build
1638-
- *step-electron-chromedriver-store
16391616

16401617
# Node.js headers
16411618
- *step-nodejs-headers-build
1642-
- *step-nodejs-headers-store
16431619

16441620
# ffmpeg
16451621
- *step-ffmpeg-gn-gen
16461622
- *step-ffmpeg-build
1647-
- *step-ffmpeg-store
16481623

16491624
# hunspell
16501625
- *step-hunspell-build
1651-
- *step-hunspell-store
16521626

16531627
# typescript defs
16541628
- *step-maybe-generate-typescript-defs
16551629

16561630
# Publish
1657-
- *step-electron-publish
1631+
- *step-electron-publish
1632+
- move_and_store_all_artifacts
16581633

16591634
# List of all jobs.
16601635
jobs:

0 commit comments

Comments
 (0)