Skip to content

Commit 1a8cb12

Browse files
committed
Modified GitHub workflow to build disk 2 of floppy disk images.
1 parent f9da3a8 commit 1a8cb12

File tree

2 files changed

+56
-26
lines changed

2 files changed

+56
-26
lines changed

.github/workflows/LuaWatcom.yml

Lines changed: 53 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -145,49 +145,79 @@ jobs:
145145
git ls-files -z | xargs -0 -I{} bash -c 'touch --date="$(git log -1 --pretty=format:%cI -- "$0")" "$0"' {}
146146
cd ..
147147
148-
- name: Create 160k 16-bit DOS Floppy Diskette Image
148+
- name: Zip OS/2 Binaries
149+
run: |
150+
zip -j9 --DOS-names scripts/meta/floppy/1440k/1/OS2.zip dist/bin/LUA21.EXE dist/bin/LUA22.EXE
151+
rm dist/bin/LUA21.EXE dist/bin/LUA22.EXE
152+
153+
- name: Zip Lua Byte Compiler Binaries
154+
run: |
155+
zip -j9 --DOS-names scripts/meta/floppy/1440k/2/LUAC.zip dist/bin/LUAC*.EXE
156+
zip -j9 -X scripts/meta/floppy/1440k/2/LUAC.zip dist/bin/LUAC*.ELF
157+
zip -j9 --DOS-names scripts/meta/floppy/160k/2/LUAC16.zip dist/bin/LUAC16.EXE
158+
rm dist/bin/LUAC*
159+
160+
- name: Set modification time on Zip binaries to the latest commit
161+
run: |
162+
touch --date="$(git log -1 --pretty=format:%cI)" scripts/meta/floppy/160k/2/*.zip scripts/meta/floppy/1440k/1/*.zip scripts/meta/floppy/1440k/2/*.zip
163+
164+
- name: Create 160k 16-bit DOS Floppy Diskette Image 1
149165
run: |
150166
export FAKETIME=$(TZ=UTC0 git show --quiet --date='format-local:%Y-%m-%d %H:%M:%S' --format="%cd")
151167
export LD_PRELOAD=$(dpkg -L libfaketime | grep libfaketime.so.1)
152-
label="LUA DOS"
168+
label="LUA DISK 1"
153169
serial="0x$(echo "$label$FAKETIME" | sha256sum | cut -c1-8)"
154170
files=$(find dist/bin/LUA16.EXE scripts/meta/floppy/160k/1/*.LUA | sort | xargs)
155171
echo "Faketime: $FAKETIME"
156-
echo "Files: $files"
172+
echo "Files: $(du -b --total $files)"
157173
echo "Label: $label"
158174
echo "Serial: $serial"
159-
mformat -C -i dist/Lua160k.ima -v "$label" -f 160 -N $serial
160-
mcopy -mi dist/Lua160k.ima $files ::
161-
162-
- name: Zip OS/2 Binaries
163-
run: |
164-
zip -j9 --DOS-names dist/bin/OS2.zip dist/bin/LUA21.EXE dist/bin/LUA22.EXE
165-
rm dist/bin/LUA21.EXE dist/bin/LUA22.EXE
175+
mformat -C -i dist/Lua160k1.ima -v "$label" -f 160 -N $serial
176+
mcopy -mi dist/Lua160k1.ima $files ::
166177
167-
- name: Zip DOS, Linux & Windows Lua Compiler Binaries
178+
- name: Create 160k 16-bit DOS Floppy Diskette Image 2
168179
run: |
169-
#TODO: put Lua byte compilers on disk 2
170-
#zip -j9 --DOS-names dist/bin/LUAC.zip dist/bin/LUAC*.EXE
171-
#zip -j9 -X dist/bin/LUAC.zip dist/bin/LUAC*.ELF
172-
rm dist/bin/LUAC*
180+
export FAKETIME=$(TZ=UTC0 git show --quiet --date='format-local:%Y-%m-%d %H:%M:%S' --format="%cd")
181+
export LD_PRELOAD=$(dpkg -L libfaketime | grep libfaketime.so.1)
182+
label="LUA DISK 2"
183+
serial="0x$(echo "$label$FAKETIME" | sha256sum | cut -c1-8)"
184+
files=$(find scripts/meta/floppy/160k/2/* | sort | xargs)
185+
echo "Faketime: $FAKETIME"
186+
echo "Files: $(du -b --total $files)"
187+
echo "Label: $label"
188+
echo "Serial: $serial"
189+
mformat -C -i dist/Lua160k2.ima -v "$label" -f 160 -N $serial
190+
mcopy -mi dist/Lua160k2.ima $files ::
173191
174-
- name: Set modification time on Zip binaries to the latest commit
192+
- name: Create 1.4M Multi-Platform Floppy Diskette Image 1
175193
run: |
176-
touch --date="$(git log -1 --pretty=format:%cI)" dist/bin/*.zip
194+
export FAKETIME=$(TZ=UTC0 git show --quiet --date='format-local:%Y-%m-%d %H:%M:%S' --format="%cd")
195+
export LD_PRELOAD=$(dpkg -L libfaketime | grep libfaketime.so.1)
196+
label="LUA DISK 1"
197+
serial="0x$(echo "$label$FAKETIME" | sha256sum | cut -c1-8)"
198+
files=$(find dist/bin/*.ELF dist/bin/*.EXE scripts/meta/floppy/1440k/1/* | sort | xargs)
199+
echo "Disk 1:"
200+
echo "Faketime: $FAKETIME"
201+
echo "Files: $(du -b --total $files)"
202+
echo "Label: $label"
203+
echo "Serial: $serial"
204+
mformat -C -i dist/Lua14D1.ima -v "$label" -f 1440 -N $serial
205+
mcopy -mi dist/Lua14D1.ima $files ::
177206
178-
- name: Create 1.4M Multi-Platform Floppy Diskette Image
207+
- name: Create 1.4M Multi-Platform Floppy Diskette Image 2
179208
run: |
180209
export FAKETIME=$(TZ=UTC0 git show --quiet --date='format-local:%Y-%m-%d %H:%M:%S' --format="%cd")
181210
export LD_PRELOAD=$(dpkg -L libfaketime | grep libfaketime.so.1)
182-
label="LUA MULTIOS"
211+
label="LUA DISK 2"
183212
serial="0x$(echo "$label$FAKETIME" | sha256sum | cut -c1-8)"
184-
files=$(find dist/bin/*.ELF dist/bin/*.EXE dist/bin/*.zip scripts/meta/floppy/1440k/1/*.LUA | sort | xargs)
213+
files=$(find dist/bin/*.zip scripts/meta/floppy/1440k/2/* | sort | xargs)
214+
echo "Disk 2:"
185215
echo "Faketime: $FAKETIME"
186-
echo "Files: $files"
216+
echo "Files: $(du -b --total $files)"
187217
echo "Label: $label"
188218
echo "Serial: $serial"
189-
mformat -C -i dist/LuaMulti.ima -v "$label" -f 1440 -N $serial
190-
mcopy -mi dist/LuaMulti.ima $files ::
219+
mformat -C -i dist/Lua14D2.ima -v "$label" -f 1440 -N $serial
220+
mcopy -mi dist/Lua14D2.ima $files ::
191221
192222
- name: Zero-out Unallocated Clusters
193223
run: |

.github/workflows/notes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Lua for Watcom builds from {{DATE}}
44

55
- `{{WLE}}` - **W**atcom **L**ua **E**xecutables: A zip file containing binaries for each platform.
66
- `{{WLI}}` - **W**atcom **L**ua **I**mages: A zip file containing floppy disk images
7-
(for direct use on floppy drives, 86Box, MISTer FPGAs AO486/PCXT cores, etc...)
8-
- 1.44mb disk image containing binaries for each platform
9-
- 160kb disk image containing just `LUA16.EXE`
7+
(for direct use on floppy drives, 86Box, MiSTer FPGAs AO486/PCXT cores, etc...)
8+
- 1.44mb disk images containing binaries for each platform
9+
- 160kb disk images containing just `LUA16.EXE`
1010

1111
Check [binary native targets](https://github.com/Lethja/lua-watcom#binary-native-targets) and [binary compatibilty matrix](https://github.com/Lethja/lua-watcom#binary-compatibility-matrix) to see which executable(s) can be used on your system.

0 commit comments

Comments
 (0)