Skip to content

Commit ef87602

Browse files
mirage335mirage335
committed
Upstream.
1 parent 9b10508 commit ef87602

File tree

10 files changed

+2538
-721
lines changed

10 files changed

+2538
-721
lines changed

‎.github/workflows/zCustom.yml‎

Lines changed: 57 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -596,18 +596,19 @@ jobs:
596596
if: ${{ github.event.inputs.DISABLE_BOOT != 'true' }}
597597
shell: bash
598598
run: |
599-
#gh release create ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} --title build --notes ""
600-
bash -c '
601-
for currentFile in ./_local/package_image_before_noBoot.tar.flx.part*
602-
do
603-
./ubiquitous_bash.sh _stopwatch gh release upload ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} "$currentFile" &
604-
while [[ $(jobs | wc -l) -ge 12 ]]
605-
do
606-
sleep 2
607-
done
608-
done
609-
wait
610-
'
599+
./ubiquitous_bash.sh _gh_release_upload_parts-multiple_sequence ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} ./_local/package_image_before_noBoot.tar.flx.part*
600+
##gh release create ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} --title build --notes ""
601+
#bash -c '
602+
#for currentFile in ./_local/package_image_before_noBoot.tar.flx.part*
603+
#do
604+
#./ubiquitous_bash.sh _stopwatch gh release upload ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} "$currentFile" &
605+
#while [[ $(jobs | wc -l) -ge 12 ]]
606+
#do
607+
#sleep 2
608+
#done
609+
#done
610+
#wait
611+
#'
611612
env:
612613
GH_TOKEN: ${{ github.token }}
613614

@@ -892,9 +893,14 @@ jobs:
892893
- name: _custom
893894
shell: bash
894895
run: |
896+
# Using qemu within _custom is very strongly discouraged, unusual, and unwise.
897+
export qemuNoKVM=${{ inputs.qemuNoKVM }}
898+
echo qemuNoKVM $qemuNoKVM
895899
./ubiquitous_bash.sh _custom || true
896900
#timeout-minutes: customTimeout
897901
timeout-minutes: 300
902+
env:
903+
GH_TOKEN: ${{ github.token }}
898904

899905

900906
- name: _custom-bundle
@@ -1033,18 +1039,19 @@ jobs:
10331039
if : ${{ github.event.inputs.DISABLE_RELEASE == 'false' || github.event.inputs.DISABLE_BOOT == 'false' }}
10341040
shell: bash
10351041
run: |
1036-
#gh release create ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} --title build --notes ""
1037-
bash -c '
1038-
for currentFile in ./_local/package_image.tar.flx.part*
1039-
do
1040-
./ubiquitous_bash.sh _stopwatch gh release upload ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} "$currentFile" &
1041-
while [[ $(jobs | wc -l) -ge 12 ]]
1042-
do
1043-
sleep 2
1044-
done
1045-
done
1046-
wait
1047-
'
1042+
./ubiquitous_bash.sh _gh_release_upload_parts-multiple_sequence ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} ./_local/package_image.tar.flx.part*
1043+
##gh release create ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} --title build --notes ""
1044+
#bash -c '
1045+
#for currentFile in ./_local/package_image.tar.flx.part*
1046+
#do
1047+
#./ubiquitous_bash.sh _stopwatch gh release upload ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} "$currentFile" &
1048+
#while [[ $(jobs | wc -l) -ge 12 ]]
1049+
#do
1050+
#sleep 2
1051+
#done
1052+
#done
1053+
#wait
1054+
#'
10481055
env:
10491056
GH_TOKEN: ${{ github.token }}
10501057

@@ -1323,18 +1330,19 @@ jobs:
13231330
- name: release! package_rootfs
13241331
shell: bash
13251332
run: |
1326-
#gh release create ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} --title build --notes ""
1327-
bash -c '
1328-
for currentFile in ./_local/package_rootfs.tar.flx.part*
1329-
do
1330-
./ubiquitous_bash.sh _stopwatch gh release upload ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} "$currentFile" &
1331-
while [[ $(jobs | wc -l) -ge 3 ]]
1332-
do
1333-
sleep 2
1334-
done
1335-
done
1336-
wait
1337-
'
1333+
./ubiquitous_bash.sh _gh_release_upload_parts-multiple_sequence ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} ./_local/package_rootfs.tar.flx.part*
1334+
##gh release create ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} --title build --notes ""
1335+
#bash -c '
1336+
#for currentFile in ./_local/package_rootfs.tar.flx.part*
1337+
#do
1338+
#./ubiquitous_bash.sh _stopwatch gh release upload ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} "$currentFile" &
1339+
#while [[ $(jobs | wc -l) -ge 3 ]]
1340+
#do
1341+
#sleep 2
1342+
#done
1343+
#done
1344+
#wait
1345+
#'
13381346
env:
13391347
GH_TOKEN: ${{ github.token }}
13401348

@@ -1574,18 +1582,19 @@ jobs:
15741582
- name: release! live
15751583
shell: bash
15761584
run: |
1577-
#gh release create ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} --title build --notes ""
1578-
bash -c '
1579-
for currentFile in ./_local/vm-live.iso.part*
1580-
do
1581-
./ubiquitous_bash.sh _stopwatch gh release upload ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} "$currentFile" &
1582-
while [[ $(jobs | wc -l) -ge 3 ]]
1583-
do
1584-
sleep 2
1585-
done
1586-
done
1587-
wait
1588-
'
1585+
./ubiquitous_bash.sh _gh_release_upload_parts-multiple_sequence ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} ./_local/vm-live.iso.part*
1586+
##gh release create ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} --title build --notes ""
1587+
#bash -c '
1588+
#for currentFile in ./_local/vm-live.iso.part*
1589+
#do
1590+
#./ubiquitous_bash.sh _stopwatch gh release upload ${{ inputs.DANGERfast_EXPERIMENT }}-${{ github.run_id }}-${{ github.run_attempt }} "$currentFile" &
1591+
#while [[ $(jobs | wc -l) -ge 3 ]]
1592+
#do
1593+
#sleep 2
1594+
#done
1595+
#done
1596+
#wait
1597+
#'
15891598
env:
15901599
GH_TOKEN: ${{ github.token }}
15911600

‎_lib/ubDistBuild‎

‎_lib/ubiquitous_bash‎

Submodule ubiquitous_bash updated 30 files

‎_prog/build-special.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ _getRelease-ubcp() {
5858
then
5959
#-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}"
6060
#curl -L -o "$currentAccessoriesDir"/integrations/ubcp/"$1" $(curl -s "https://api.github.com/repos/mirage335/ubiquitous_bash/releases" | jq -r ".[] | select(.name == \"internal\") | .assets[] | select(.name == \"""$1""\") | .browser_download_url" | sort -n -r | head -n1)
61-
curl -L -o "$currentAccessoriesDir"/integrations/ubcp/"$1" $(curl -s "https://api.github.com/repos/mirage335-colossus/ubiquitous_bash/releases" | jq -r ".[] | select(.name == \"internal\") | .assets[] | select(.name == \"""$1""\") | .browser_download_url" | sort -n -r | head -n1)
61+
#curl -L -o "$currentAccessoriesDir"/integrations/ubcp/"$1" $(curl -s "https://api.github.com/repos/mirage335-colossus/ubiquitous_bash/releases" | jq -r ".[] | select(.name == \"internal\") | .assets[] | select(.name == \"""$1""\") | .browser_download_url" | sort -n -r | head -n1)
62+
_wget_githubRelease "mirage335-colossus/ubiquitous_bash" "internal" "$1" -O "$currentAccessoriesDir"/integrations/ubcp/"$1"
6263
fi
6364
}
6465

‎_prog/compile_bash_prog.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ _compile_bash_program_prog() {
138138

139139

140140
includeScriptList+=( core-upgrade.sh )
141+
142+
143+
144+
145+
includeScriptList+=( core-micro.sh )
141146

142147
true
143148
}

0 commit comments

Comments
 (0)