fix(workflow): now properly builds image and uses that instead

Author: ZigTag

.dockerignore

@@ -0,0 +1,4 @@
+target
+out
+node_modules
+test_work

.github/workflows/pre-release.yml

@@ -14,16 +14,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Build WASM module
-        uses: Navigraph/cargo-msfs@v1
-        with:
-          token: ${{ secrets.BOT_TOKEN }}
-          run: ./scripts/build.sh
-
-      - name: Zip Modules
-        run: |
-          zip -j interface2020.zip out20/*
-          zip -j interface2024.zip out24/*
+      - name: Workflow Script
+        run: ./scripts/workflow.sh
 
       - name: Pre-Release
         uses: softprops/action-gh-release@v1

.gitignore

@@ -7,6 +7,8 @@ tsconfig.tsbuildinfo
 examples/aircraft/PackageSources/html_ui/Pages/VCockpit/Instruments/Navigraph/NavigationDataInterfaceSample
 examples/aircraft/PackageSources/SimObjects/Airplanes/Navigraph_Navigation_Data_Interface_Aircraft/panel/msfs_navigation_data_interface.wasm
 out
+out20
+out24
 
 # Rust
 # will have compiled files and executables

Dockerfile

@@ -0,0 +1,23 @@
+FROM ghcr.io/navigraph/cargo-msfs-bin:latest
+
+WORKDIR /external
+
+RUN apt install git -y 
+
+RUN cargo-msfs install msfs2020
+RUN cargo-msfs install msfs2024
+
+RUN apt install npm -y
+
+COPY package.json ./
+COPY package-lock.json ./
+
+RUN npm i
+
+COPY rust-toolchain.toml ./
+
+RUN rustup show
+
+COPY . .
+
+

build.zip

@@ -7,8 +7,9 @@
     "format": "prettier --write .",
     "lint:js": "eslint \"src/js/**/*.ts\"",
     "setup": ".\\scripts\\setup.bat",
-    "build:wasm": ".\\scripts\\build.bat",
-    "build:wasm-workflow": ".\\scripts\\build_workflow.bat",
+    "build:wasm": ".\\scripts\\build.bat both",
+    "build:wasm:2020": ".\\scripts\\build.bat 2020",
+    "build:wasm:2024": ".\\scripts\\build.bat 2024",
     "build:js": "cd .\\src\\js && npm run build",
     "build:gauge": "cd .\\examples\\gauge && npm run build",
     "dev:gauge": "cd .\\examples\\gauge && npm run dev",

package.json

@@ -2,8 +2,6 @@
 
 cd %~dp0
 
-mkdir ..\out
+CALL .\run_docker_cmd.bat ./scripts/build.sh %*
 
-cargo-msfs build msfs2020 -i .. -o ..\out\msfs_navigation_data_interface.wasm
-
-copy ..\out\msfs_navigation_data_interface.wasm ..\examples\aircraft\PackageSources\SimObjects\Airplanes\Navigraph_Navigation_Data_Interface_Aircraft\panel
+copy ..\out20\msfs_navigation_data_interface.wasm ..\examples\aircraft\PackageSources\SimObjects\Airplanes\Navigraph_Navigation_Data_Interface_Aircraft\panel

scripts/build.bat

@@ -1,13 +1,19 @@
-mkdir out20
-mkdir out24
-
-echo Installing MSFS SDK
+#!/bin/bash
 
-cargo-msfs install msfs2020
-cargo-msfs install msfs2024
+if ! [ -a out20 ]; then
+mkdir out20
+fi
 
-echo Building packages in dir $(pwd)
+if ! [ -a out24 ]; then
+mkdir out24
+fi
 
-cargo-msfs build msfs2020 -i . -o out20/msfs_navigation_data_interface.wasm
-cargo-msfs build msfs2024 -i . -o out24/msfs_navigation_data_interface.wasm
+if [ $1 = "2020" ] || [ $1 = "both" ]; then
+    echo "Building MSFS 2020"
+    cargo-msfs build msfs2020 -i . -o out20/msfs_navigation_data_interface.wasm
+fi
 
+if [ $1 = "2024" ] || [ $1 = "both" ]; then
+    echo "Building MSFS 2024"
+    cargo-msfs build msfs2024 -i . -o out24/msfs_navigation_data_interface.wasm
+fi

scripts/build.sh

@@ -1,7 +1,7 @@
 @echo off
 
-set image="ghcr.io/flybywiresim/dev-env@sha256:aa36c0e4b8c66c2ec0195a104f8ae04a8ffbf45e8ddb6a8aca4f7237436bd876"
+set image="local"
 
 cd %~dp0
 
-docker run --rm -it -v "%cd%\..\:/external" -v "%cd%\..\out:/out" %image% %*
+docker run --rm -it -v "%cd%\..\:/external" %image% %*

scripts/run_docker_cmd.bat

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+IMAGE="local"
+
+cd "$(dirname "$0")"
+
+echo "Running $@ in docker"
+
+docker run --rm -v "$(pwd)/../:/external" $IMAGE "$@"