Merge pull request #1231 from larzconwell/master

Include odinfmt in release assets

3 files changed, 26 insertions, 11 deletions

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a1f50f6..6fbc247 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -38,6 +38,7 @@ jobs:
       run: |
         mkdir dist
         mv ols dist/ols-arm64-darwin
+        mv odinfmt dist/odinfmt-arm64-darwin
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
@@ -73,6 +74,7 @@ jobs:
       run: |
         mkdir dist
         mv ols dist/ols-x86_64-darwin
+        mv odinfmt dist/odinfmt-x86_64-darwin
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
@@ -108,6 +110,7 @@ jobs:
       run: |
         mkdir dist
         mv ols dist/ols-x86_64-unknown-linux-gnu
+        mv odinfmt dist/odinfmt-x86_64-unknown-linux-gnu
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
@@ -145,6 +148,7 @@ jobs:
       run: |
         mkdir dist
         mv ols dist/ols-arm64-unknown-linux-gnu
+        mv odinfmt dist/odinfmt-arm64-unknown-linux-gnu
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
@@ -181,9 +185,11 @@ jobs:
       run: |
         mkdir dist
         move ols.exe dist/
+        move odinfmt.exe dist/
         move builtin dist/
         cd dist
         ren ols.exe ols-x86_64-pc-windows-msvc.exe
+        ren odinfmt.exe odinfmt-x86_64-pc-windows-msvc.exe
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
@@ -230,24 +236,24 @@ jobs:
     - run: |
         ls -al ./dist
         cd dist
-        zip -r ols-x86_64-pc-windows-msvc.zip ols-x86_64-pc-windows-msvc.exe builtin
-        rm ols-x86_64-pc-windows-msvc.exe
+        zip -r ols-x86_64-pc-windows-msvc.zip ols-x86_64-pc-windows-msvc.exe odinfmt-x86_64-pc-windows-msvc.exe builtin
+        rm ols-x86_64-pc-windows-msvc.exe odinfmt-x86_64-pc-windows-msvc.exe
 
         chmod +x ols-x86_64-unknown-linux-gnu
-        zip -r ols-x86_64-unknown-linux-gnu.zip ols-x86_64-unknown-linux-gnu builtin
-        rm ols-x86_64-unknown-linux-gnu
+        zip -r ols-x86_64-unknown-linux-gnu.zip ols-x86_64-unknown-linux-gnu odinfmt-x86_64-unknown-linux-gnu builtin
+        rm ols-x86_64-unknown-linux-gnu odinfmt-x86_64-unknown-linux-gnu
 
         chmod +x ols-arm64-unknown-linux-gnu
-        zip -r ols-arm64-unknown-linux-gnu.zip ols-arm64-unknown-linux-gnu builtin
-        rm ols-arm64-unknown-linux-gnu
+        zip -r ols-arm64-unknown-linux-gnu.zip ols-arm64-unknown-linux-gnu odinfmt-arm64-unknown-linux-gnu builtin
+        rm ols-arm64-unknown-linux-gnu odinfmt-arm64-unknown-linux-gnu
 
         chmod +x ols-x86_64-darwin
-        zip -r ols-x86_64-darwin.zip ols-x86_64-darwin builtin
-        rm ols-x86_64-darwin
+        zip -r ols-x86_64-darwin.zip ols-x86_64-darwin odinfmt-x86_64-darwin builtin
+        rm ols-x86_64-darwin odinfmt-x86_64-darwin
 
         chmod +x ols-arm64-darwin
-        zip -r ols-arm64-darwin.zip ols-arm64-darwin builtin
-        rm ols-arm64-darwin
+        zip -r ols-arm64-darwin.zip ols-arm64-darwin odinfmt-arm64-darwin builtin
+        rm ols-arm64-darwin odinfmt-arm64-darwin
 
         rm -rf builtin
     - name: Publish Release
diff --git a/ci.bat b/ci.bat
index 9466d7c..f43b512 100644
--- a/ci.bat
+++ b/ci.bat
@@ -15,8 +15,14 @@ if "%1" == "CI" (
 
     odin build src\ -collection:src=src -out:ols.exe -o:speed  -no-bounds-check -extra-linker-flags:"/STACK:4000000,2000000" -define:VERSION=%OLS_VERSION%
 
+    pushd .
     call "tools/odinfmt/tests.bat"
     if %errorlevel% neq 0 exit /b 1
+    popd
+
+    odin build tools\odinfmt\main.odin -file -collection:src=src -out:odinfmt.exe -o:speed -no-bounds-check -extra-linker-flags:"/STACK:4000000,2000000"
 ) else (
     odin build src\ -collection:src=src -out:ols.exe -o:speed  -no-bounds-check -extra-linker-flags:"/STACK:4000000,2000000" -define:VERSION=%OLS_VERSION%
+
+    odin build tools\odinfmt\main.odin -file -collection:src=src -out:odinfmt.exe -o:speed -no-bounds-check -extra-linker-flags:"/STACK:4000000,2000000"
 )
diff --git a/ci.sh b/ci.sh
index 35631c3..79128eb 100755
--- a/ci.sh
+++ b/ci.sh
@@ -38,5 +38,8 @@ then
     export PATH=$PATH:$PWD/Odin
 fi
 
-
+echo "Building ols"
 odin build src/ -show-timings -collection:src=src -out:ols -no-bounds-check -o:speed -define:VERSION=$OLS_VERSION $@
+
+echo "Building odinfmt"
+odin build tools/odinfmt/main.odin -file -show-timings -collection:src=src -out:odinfmt -no-bounds-check -o:speed $@