mirror of
https://github.com/iiab/iiab.git
synced 2025-02-12 19:22:24 +00:00
Merge pull request #3931 from holta/tz-hack
Restore both GitHub Actions workflows simulating Raspberry Pi
This commit is contained in:
commit
11f65e7689
2 changed files with 5 additions and 3 deletions
|
@ -77,7 +77,7 @@
|
||||||
- option: name
|
- option: name
|
||||||
value: USB_LIB
|
value: USB_LIB
|
||||||
- option: description
|
- option: description
|
||||||
value: '"USB_LIB automounts Teacher Content on USB drives to /library/www/html/local_content, so students can browse it almost immediately at http://box/usb"'
|
value: '"USB_LIB automounts Teacher Content on USB sticks to /library/www/html/local_content, so students can browse the USB AND upload their work to the USB, all at http://box/usb"'
|
||||||
- option: usb_lib_install
|
- option: usb_lib_install
|
||||||
value: "{{ usb_lib_install }}"
|
value: "{{ usb_lib_install }}"
|
||||||
- option: usb_lib_enabled
|
- option: usb_lib_enabled
|
||||||
|
|
|
@ -30,8 +30,10 @@
|
||||||
# 1) Try spawning these "guyot/arm-runner-action@v2" GHA workflows with... use_systemd_nspawn: true
|
# 1) Try spawning these "guyot/arm-runner-action@v2" GHA workflows with... use_systemd_nspawn: true
|
||||||
# 2) Weaken timedatectl command just below, trying this instead... shell: readlink /etc/localtime | sed 's#^/usr/share/zoneinfo/##'
|
# 2) Weaken timedatectl command just below, trying this instead... shell: readlink /etc/localtime | sed 's#^/usr/share/zoneinfo/##'
|
||||||
|
|
||||||
- name: Extract Time Zone from symlink /etc/localtime &/or text file /etc/timezone (or lack thereof!)
|
- name: Extract Time Zone from symlink /etc/localtime, text file /etc/timezone, or if all else fails declare Etc/UTC
|
||||||
command: timedatectl show -p Timezone --value
|
# command: timedatectl show -p Timezone --value
|
||||||
|
# 2025-02-01: "guyot/arm-runner-action@v2" GHA workflows don't seem to work with "use_systemd_nspawn: true", so hack in the equivalent of timedatectl...
|
||||||
|
shell: tmp=$(readlink /etc/localtime) && echo $tmp | sed 's|^/usr/share/zoneinfo/||' || cat /etc/timezone || echo Etc/UTC
|
||||||
register: tz_cli
|
register: tz_cli
|
||||||
|
|
||||||
- name: Store 'date.timezone = {{ tz_cli.stdout }}' (from above) in /etc/php/{{ php_version }}/fpm/php.ini and /etc/php/{{ php_version }}/cli/php.ini
|
- name: Store 'date.timezone = {{ tz_cli.stdout }}' (from above) in /etc/php/{{ php_version }}/fpm/php.ini and /etc/php/{{ php_version }}/cli/php.ini
|
||||||
|
|
Loading…
Reference in a new issue