moved build scripts to new build directory

This commit is contained in:
Mikayla Fischler 2024-06-29 15:14:43 -04:00
parent 3ad3cbb4eb
commit 0b2f7b13a1
3 changed files with 7 additions and 3 deletions

View File

@ -46,7 +46,7 @@ jobs:
- name: Generate manifest and shields for main branch - name: Generate manifest and shields for main branch
id: manifest-main id: manifest-main
if: ${{ (success() || failure()) && steps.checkout-main.outcome == 'success' }} if: ${{ (success() || failure()) && steps.checkout-main.outcome == 'success' }}
run: python imgen.py shields run: python ./build/imgen.py shields
- name: Save main's manifest - name: Save main's manifest
if: ${{ (success() || failure()) && steps.manifest-main.outcome == 'success' }} if: ${{ (success() || failure()) && steps.manifest-main.outcome == 'success' }}
run: mv install_manifest.json deploy/manifests/main run: mv install_manifest.json deploy/manifests/main
@ -61,7 +61,7 @@ jobs:
- name: Generate manifest for devel - name: Generate manifest for devel
id: manifest-devel id: manifest-devel
if: ${{ (success() || failure()) && steps.checkout-devel.outcome == 'success' }} if: ${{ (success() || failure()) && steps.checkout-devel.outcome == 'success' }}
run: python imgen.py run: python ./build/imgen.py
- name: Save devel's manifest - name: Save devel's manifest
if: ${{ (success() || failure()) && steps.manifest-devel.outcome == 'success' }} if: ${{ (success() || failure()) && steps.manifest-devel.outcome == 'success' }}
run: mv install_manifest.json deploy/manifests/devel run: mv install_manifest.json deploy/manifests/devel

View File

@ -44,9 +44,11 @@ def get_version(path, is_lib = False):
# generate installation manifest object # generate installation manifest object
def make_manifest(size): def make_manifest(size):
os.chdir('./_minified')
manifest = { manifest = {
"versions" : { "versions" : {
"installer" : get_version("./ccmsi.lua"), "installer" : get_version("../ccmsi.lua"),
"bootloader" : get_version("./startup.lua"), "bootloader" : get_version("./startup.lua"),
"common" : get_version("./scada-common/util.lua", True), "common" : get_version("./scada-common/util.lua", True),
"comms" : get_version("./scada-common/comms.lua", True), "comms" : get_version("./scada-common/comms.lua", True),
@ -95,6 +97,8 @@ def make_manifest(size):
} }
} }
os.chdir('../')
return manifest return manifest
# write initial manifest with placeholder size # write initial manifest with placeholder size