Skip to content

Commit 04142cc

Browse files
committed
Updated CI with the new Lua Script folder structure changes.
1 parent edf8442 commit 04142cc

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.github/workflows/LuaWatcom.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
3838
- name: Patch Lua Source Code for Open Watcom
3939
run: |
40-
lua demo/xtra/PATCH.LUA lua.pat
40+
lua scripts/dev/PATCH.LUA lua.pat
4141
4242
- name: Check GCC can build Lua after patches
4343
run: |
@@ -87,15 +87,15 @@ jobs:
8787
8888
- name: Ensure Lua Scripts Have CR/LF Line Endings
8989
run: |
90-
lua demo/xtra/DOSFREN.LUA demo/core/*.LUA demo/xtra/*.LUA
90+
lua scripts/util/DOSFREN.LUA scripts/meta/floppy/1440k/*/*.LUA
9191
9292
- name: Set constant time information on PE header
9393
run: |
94-
lua demo/util/PE95TIME.LUA dist/bin/LUANT.EXE
94+
lua scripts/dev/PE95TIME.LUA dist/bin/LUANT.EXE
9595
9696
- name: Set modification time on scripts to their respective commit
9797
run: |
98-
cd demo
98+
cd scripts
9999
git ls-files -z | xargs -0 -I{} bash -c 'touch --date="$(git log -1 --pretty=format:%cI -- "$0")" "$0"' {}
100100
cd ..
101101
@@ -109,9 +109,9 @@ jobs:
109109
110110
- name: Create Binaries Zip
111111
run: |
112-
files=$(find dist/bin/*.EXE demo/core/*.LUA demo/xtra/*.LUA ! -executable | sort | xargs)
112+
files=$(find dist/bin/*.EXE scripts/meta/floppy/1440k/*/*.LUA ! -executable | sort | xargs)
113113
zip -j9 --DOS-names dist/LuaExe.zip $files
114-
exe=$(find dist/bin/*.ELF demo/core/*.LUA demo/xtra/*.LUA -executable | sort | xargs)
114+
exe=$(find dist/bin/*.ELF scripts/meta/floppy/1440k/*/*.LUA -executable | sort | xargs)
115115
zip -j9 -X dist/LuaExe.zip $exe
116116
name="dist/WLE$(sha256sum dist/LuaExe.zip | awk '{print $1}' | cut -c1-5).zip"
117117
mv dist/LuaExe.zip $name
@@ -129,16 +129,16 @@ jobs:
129129
130130
- name: Squish Lua Scripts for Floppy Disk Images
131131
run: |
132-
find demo -name "*.LUA" -type f -exec demo/util/SQUISH.LUA {} +
133-
find demo -name "*.LUA" -type f -exec demo/xtra/DOSFREN.LUA {} +
132+
find scripts -name "*.LUA" -type f -exec scripts/util/SQUISH.LUA {} +
133+
find scripts -name "*.LUA" -type f -exec scripts/util/DOSFREN.LUA {} +
134134
135135
- name: Set modification time on UPX compressed binaries to the latest commit
136136
run: |
137137
touch --date="$(git log -1 --pretty=format:%cI)" dist/bin/*.ELF dist/bin/*.EXE
138138
139139
- name: Set modification time on squished scripts to their respective commit
140140
run: |
141-
cd demo
141+
cd scripts
142142
git ls-files -z | xargs -0 -I{} bash -c 'touch --date="$(git log -1 --pretty=format:%cI -- "$0")" "$0"' {}
143143
cd ..
144144
@@ -148,7 +148,7 @@ jobs:
148148
export LD_PRELOAD=$(dpkg -L libfaketime | grep libfaketime.so.1)
149149
label="LUA DOS"
150150
serial="0x$(echo "$label$FAKETIME" | sha256sum | cut -c1-8)"
151-
files=$(find dist/bin/LUA16.EXE demo/core/*.LUA | sort | xargs)
151+
files=$(find dist/bin/LUA16.EXE scripts/meta/floppy/160k/1/*.LUA | sort | xargs)
152152
echo "Faketime: $FAKETIME"
153153
echo "Files: $files"
154154
echo "Label: $label"
@@ -162,7 +162,7 @@ jobs:
162162
export LD_PRELOAD=$(dpkg -L libfaketime | grep libfaketime.so.1)
163163
label="LUA MULTIOS"
164164
serial="0x$(echo "$label$FAKETIME" | sha256sum | cut -c1-8)"
165-
files=$(find dist/bin/*.ELF dist/bin/*.EXE demo/core/*.LUA demo/xtra/*.LUA | sort | xargs)
165+
files=$(find dist/bin/*.ELF dist/bin/*.EXE scripts/meta/floppy/1440k/1/*.LUA | sort | xargs)
166166
echo "Faketime: $FAKETIME"
167167
echo "Files: $files"
168168
echo "Label: $label"
@@ -172,7 +172,7 @@ jobs:
172172
173173
- name: Zero-out Unallocated Clusters
174174
run: |
175-
lua demo/util/FATSTAT.LUA -z dist/*ima
175+
lua scripts/util/FATSTAT.LUA -z dist/*ima
176176
177177
- name: Create Floppy Disk Images Zip
178178
run: |

0 commit comments

Comments
 (0)