Skip to content

Commit 6c4d523

Browse files
mirage335mirage335
committed
Upstream.
1 parent 96a43e2 commit 6c4d523

File tree

5 files changed

+89
-2
lines changed

5 files changed

+89
-2
lines changed

‎.github/workflows/zCustom.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,11 @@ jobs:
151151
remove-codeql: 'true'
152152
#remove-docker-images: ${{ github.event.inputs.runnerName != 'ubuntu-latest-m' && github.event.inputs.runnerName != 'ubuntu-latest-l' && github.event.inputs.runnerName != 'ubuntu-latest-h' }}
153153
remove-docker-images: 'true'
154+
- name: df
155+
shell: bash
156+
run: |
157+
df -h
158+
df -h /
154159
# https://github.com/orgs/community/discussions/8305
155160
# https://github.blog/changelog/2023-02-23-hardware-accelerated-android-virtualization-on-actions-windows-and-linux-larger-hosted-runners/
156161
# https://github.com/actions/runner-images/discussions/7191
@@ -567,6 +572,11 @@ jobs:
567572
remove-codeql: 'true'
568573
#remove-docker-images: ${{ github.event.inputs.runnerName != 'ubuntu-latest-m' && github.event.inputs.runnerName != 'ubuntu-latest-l' && github.event.inputs.runnerName != 'ubuntu-latest-h' }}
569574
remove-docker-images: 'true'
575+
- name: df
576+
shell: bash
577+
run: |
578+
df -h
579+
df -h /
570580
- name: _getCore_ub
571581
shell: bash
572582
timeout-minutes: 90
@@ -924,6 +934,11 @@ jobs:
924934
remove-codeql: 'true'
925935
#remove-docker-images: ${{ github.event.inputs.runnerName != 'ubuntu-latest-m' && github.event.inputs.runnerName != 'ubuntu-latest-l' && github.event.inputs.runnerName != 'ubuntu-latest-h' }}
926936
remove-docker-images: 'true'
937+
- name: df
938+
shell: bash
939+
run: |
940+
df -h
941+
df -h /
927942
- name: _getCore_ub
928943
shell: bash
929944
run: |
@@ -1106,6 +1121,11 @@ jobs:
11061121
remove-codeql: 'true'
11071122
#remove-docker-images: ${{ github.event.inputs.runnerName != 'ubuntu-latest-m' && github.event.inputs.runnerName != 'ubuntu-latest-l' && github.event.inputs.runnerName != 'ubuntu-latest-h' }}
11081123
remove-docker-images: 'true'
1124+
- name: df
1125+
shell: bash
1126+
run: |
1127+
df -h
1128+
df -h /
11091129
# https://github.com/orgs/community/discussions/8305
11101130
# https://github.blog/changelog/2023-02-23-hardware-accelerated-android-virtualization-on-actions-windows-and-linux-larger-hosted-runners/
11111131
# https://github.com/actions/runner-images/discussions/7191
@@ -1328,6 +1348,11 @@ jobs:
13281348
remove-codeql: 'true'
13291349
#remove-docker-images: ${{ github.event.inputs.runnerName != 'ubuntu-latest-m' && github.event.inputs.runnerName != 'ubuntu-latest-l' && github.event.inputs.runnerName != 'ubuntu-latest-h' }}
13301350
remove-docker-images: 'true'
1351+
- name: df
1352+
shell: bash
1353+
run: |
1354+
df -h
1355+
df -h /
13311356
13321357
- name: _getCore_ub
13331358
shell: bash

‎_lib/ubDistBuild‎

‎_prog/build-special.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,17 @@ _build_ubDistBuild-fetch() {
181181
cd "$functionEntryPWD"
182182

183183

184+
185+
186+
cd "$currentAccessoriesDir"/parts/
187+
_gitBest clone --depth 1 --recursive [email protected]:soaringDistributions/ubdist_dummy.git
188+
cd "$functionEntryPWD"
189+
190+
cd "$currentAccessoriesDir"/parts/
191+
_gitBest clone --depth 1 --recursive [email protected]:soaringDistributions/ubdist_puddleJumper.git
192+
cd "$functionEntryPWD"
193+
194+
184195
cd "$functionEntryPWD"
185196
_stop
186197
}

‎_prog/installation_prog.sh‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,24 @@ _test_prog() {
77
_wantGetDep unsquashfs
88
}
99

10+
_gitMad_neighbors_procedure() {
11+
local functionEntryPWD
12+
functionEntryPWD="$PWD"
13+
14+
[[ ! -e '/cygdrive/c/core/variant/ubdist_dummy' ]] && _messageFAIL
15+
cd '/cygdrive/c/core/variant/ubdist_dummy'
16+
_gitMad
17+
18+
[[ ! -e '/cygdrive/c/core/variant/ubdist_puddleJumper' ]] && _messageFAIL
19+
cd '/cygdrive/c/core/variant/ubdist_puddleJumper'
20+
_gitMad
21+
22+
cd "$functionEntryPWD"
23+
}
24+
_gitMad_neighbors() {
25+
"$scriptAbsoluteLocation _gitMad_neighbors "$@""
26+
}
27+
1028

1129
_setup_install() {
1230
true
@@ -64,6 +82,8 @@ _setup_install() {
6482

6583
_messagePlain_probe_cmd _self_gitMad
6684

85+
_messagePlain_probe_cmd _gitMad_neighbors
86+
6787
sleep 5
6888
}
6989

‎ubiquitous_bash.sh‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ _ub_cksum_special_derivativeScripts_contents() {
3636
#export ub_setScriptChecksum_disable='true'
3737
( [[ -e "$0".nck ]] || [[ "${BASH_SOURCE[0]}" != "${0}" ]] || [[ "$1" == '--profile' ]] || [[ "$1" == '--script' ]] || [[ "$1" == '--call' ]] || [[ "$1" == '--return' ]] || [[ "$1" == '--devenv' ]] || [[ "$1" == '--shell' ]] || [[ "$1" == '--bypass' ]] || [[ "$1" == '--parent' ]] || [[ "$1" == '--embed' ]] || [[ "$1" == '--compressed' ]] || [[ "$0" == "/bin/bash" ]] || [[ "$0" == "-bash" ]] || [[ "$0" == "/usr/bin/bash" ]] || [[ "$0" == "bash" ]] ) && export ub_setScriptChecksum_disable='true'
3838
export ub_setScriptChecksum_header='2591634041'
39-
export ub_setScriptChecksum_contents='2990324807'
39+
export ub_setScriptChecksum_contents='3950898990'
4040

4141
# CAUTION: Symlinks may cause problems. Disable this test for such cases if necessary.
4242
# WARNING: Performance may be crucial here.
@@ -46229,6 +46229,24 @@ _test_prog() {
4622946229
_wantGetDep unsquashfs
4623046230
}
4623146231

46232+
_gitMad_neighbors_procedure() {
46233+
local functionEntryPWD
46234+
functionEntryPWD="$PWD"
46235+
46236+
[[ ! -e '/cygdrive/c/core/variant/ubdist_dummy' ]] && _messageFAIL
46237+
cd '/cygdrive/c/core/variant/ubdist_dummy'
46238+
_gitMad
46239+
46240+
[[ ! -e '/cygdrive/c/core/variant/ubdist_puddleJumper' ]] && _messageFAIL
46241+
cd '/cygdrive/c/core/variant/ubdist_puddleJumper'
46242+
_gitMad
46243+
46244+
cd "$functionEntryPWD"
46245+
}
46246+
_gitMad_neighbors() {
46247+
"$scriptAbsoluteLocation _gitMad_neighbors "$@""
46248+
}
46249+
4623246250

4623346251
_setup_install() {
4623446252
true
@@ -46286,6 +46304,8 @@ _setup_install() {
4628646304

4628746305
_messagePlain_probe_cmd _self_gitMad
4628846306

46307+
_messagePlain_probe_cmd _gitMad_neighbors
46308+
4628946309
sleep 5
4629046310
}
4629146311

@@ -50069,6 +50089,17 @@ _build_ubDistBuild-fetch() {
5006950089
cd "$functionEntryPWD"
5007050090

5007150091

50092+
50093+
50094+
cd "$currentAccessoriesDir"/parts/
50095+
_gitBest clone --depth 1 --recursive [email protected]:soaringDistributions/ubdist_dummy.git
50096+
cd "$functionEntryPWD"
50097+
50098+
cd "$currentAccessoriesDir"/parts/
50099+
_gitBest clone --depth 1 --recursive [email protected]:soaringDistributions/ubdist_puddleJumper.git
50100+
cd "$functionEntryPWD"
50101+
50102+
5007250103
cd "$functionEntryPWD"
5007350104
_stop
5007450105
}

0 commit comments

Comments
 (0)