Skip to content

Commit 529cf47

Browse files
committed
Draft.
1 parent 7d90771 commit 529cf47

File tree

7 files changed

+927
-38
lines changed

7 files changed

+927
-38
lines changed

.github/workflows/zCustom.yml

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ jobs:
100100
101101
102102
103+
103104
build_before_noBoot:
104105
needs: [build_release]
105106
#runs-on: ${{ github.event.inputs.runnerName == '' && 'ubuntu-latest-m' || github.event.inputs.runnerName }}
@@ -216,6 +217,7 @@ jobs:
216217
#! sudo -n apt-get -d install -y virtualbox-7.0 && exit 1
217218
#! sudo -n ./ubiquitous_bash.sh _getMost_ubuntu22-VBoxManage && exit 1
218219
sudo -n env DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install --install-recommends -y xvfb
220+
sudo -n env DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install --install-recommends -y x11-apps
219221
df -h
220222
df -h /
221223
timeout-minutes: 355
@@ -325,6 +327,7 @@ jobs:
325327
./ubiquitous_bash.sh _chroot rm -f /binReport
326328
./ubiquitous_bash.sh _chroot rm -f /coreReport
327329
./ubiquitous_bash.sh _chroot rm -f /cfgFW.log
330+
./ubiquitous_bash.sh _chroot rm -f /FW-done
328331
! ./ubiquitous_bash.sh _closeChRoot && exit 1
329332
true
330333
@@ -422,7 +425,7 @@ jobs:
422425
shell: bash
423426
run: |
424427
! ./ubiquitous_bash.sh _openChRoot && exit 1
425-
sudo -n cp -f "$globalVirtFS"/cfgFW.log "./_local"/cfgFW.log
428+
sudo -n cp -f "./_local/v/fs"/cfgFW.log "./_local"/cfgFW.log
426429
sudo -n chown "$USER":"$USER" "./_local"/cfgFW.log
427430
cat ./_local/cfgFW.log
428431
rm -f ./_local/cfgFW.log
@@ -573,20 +576,6 @@ jobs:
573576
df -h
574577
df -h /
575578
timeout-minutes: 355
576-
- name: _getMost-xvfb
577-
shell: bash
578-
run: |
579-
#! ./ubiquitous_bash.sh _getMost && exit 1
580-
#true
581-
#! sudo -n apt-get -y clean && exit 1
582-
#! ./ubiquitous_bash.sh _getMost_debian11_aptSources && exit 1
583-
#sudo -n apt-get update
584-
#! sudo -n apt-get -d install -y virtualbox-7.0 && exit 1
585-
#! sudo -n ./ubiquitous_bash.sh _getMost_ubuntu22-VBoxManage && exit 1
586-
sudo -n env DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install --install-recommends -y xvfb
587-
df -h
588-
df -h /
589-
timeout-minutes: 355
590579

591580
- name: _test_hash_legacy
592581
shell: bash
@@ -688,6 +677,7 @@ jobs:
688677
#./ubiquitous_bash.sh _chroot rm -f /binReport
689678
#./ubiquitous_bash.sh _chroot rm -f /coreReport
690679
#./ubiquitous_bash.sh _chroot rm -f /cfgFW.log
680+
#./ubiquitous_bash.sh _chroot rm -f /FW-done
691681

692682
- name: _zSpecial_report
693683
shell: bash
@@ -1100,20 +1090,6 @@ jobs:
11001090
df -h
11011091
df -h /
11021092
timeout-minutes: 355
1103-
- name: _getMost-xvfb
1104-
shell: bash
1105-
run: |
1106-
#! ./ubiquitous_bash.sh _getMost && exit 1
1107-
#true
1108-
#! sudo -n apt-get -y clean && exit 1
1109-
#! ./ubiquitous_bash.sh _getMost_debian11_aptSources && exit 1
1110-
#sudo -n apt-get update
1111-
#! sudo -n apt-get -d install -y virtualbox-7.0 && exit 1
1112-
#! sudo -n ./ubiquitous_bash.sh _getMost_ubuntu22-VBoxManage && exit 1
1113-
sudo -n env DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install --install-recommends -y xvfb
1114-
df -h
1115-
df -h /
1116-
timeout-minutes: 355
11171093

11181094
- name: _test_hash_legacy
11191095
shell: bash

_prog/compile_bash_prog.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ _compile_bash_program_prog() {
120120

121121
includeScriptList+=( get.sh )
122122

123+
includeScriptList+=( core-custom.sh )
124+
123125
includeScriptList+=( features.sh )
124126

125127

0 commit comments

Comments
 (0)