Windows builds

.onedev-buildspec.yml

@@ -32,25 +32,6 @@ jobs:
       passwordSecret: dockersecret
     platforms: linux/amd64
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  - !CommandStep
-    name: Build Tar
-    runInContainer: true
-    image: onedev.site.tesses.net/dependencies/build:latest
-    interpreter: !DefaultInterpreter
-      commands: |
-        mkdir build2
-        cd build2
-        cmake -S .. -B . -DTESSESFRAMEWORK_ENABLE_SHARED=ON -DTESSESFRAMEWORK_ENABLE_STATIC=OFF -DTESSESFRAMEWORK_FETCHCONTENT=ON
-        make -j12
-        make install DESTDIR=../crosslang
-        cd ..
-        tar cvzf crosslang-x86_64.tar.gz crosslang
-    useTTY: true
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  - !PublishArtifactStep
-    name: Publish CrossLang Artifact
-    artifacts: crosslang-x86_64.tar.gz
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   - !CommandStep
     name: Wii Build
     runInContainer: true
@@ -67,6 +48,7 @@ jobs:
     image: onedev.site.tesses.net/dependencies/debbuilder/jammy:latest
     interpreter: !DefaultInterpreter
       commands: |
+        mkdir artifacts
         apt update -y
         apt install -y pkg-config git gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 gcc-mingw-w64-i686 g++-mingw-w64-i686
         cd Packaging/Linux
@@ -85,25 +67,24 @@ jobs:
       value: '@secret:CPKG_KEY@'
     useTTY: true
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  - !PublishArtifactStep
+  - !SCPCommandStep
-    name: Publish Win32 Installer
+    name: Copy Files
-    sourcePath: Packaging/Windows/build-x86
+    privateKeySecret: TRUENAS_SSH
-    artifacts: TessesCrossLang-*-win32.exe
+    source: artifacts
+    target: mike@@10.137.42.30:/mnt/storage24tb/Files/Public/CrossLang/@build_number@
+    options: -r
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  - !PublishArtifactStep
+  - !SSHCommandStep
-    name: Publish Win32 ZIP
+    name: Link latest
-    sourcePath: Packaging/Windows/build-x86
+    remoteMachine: 10.137.42.30
-    artifacts: TessesCrossLang-*-win32.zip
+    userName: mike
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    privateKeySecret: TRUENAS_SSH
-  - !PublishArtifactStep
+    commands: |
-    name: Publish Win64 Installer
+      cd /mnt/storage24tb/Files/Public/CrossLang
-    sourcePath: Packaging/Windows/build-x64
+      ln -s $NUMBER latest
-    artifacts: TessesCrossLang-*-win64.exe
+    envVars:
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    - name: NUMBER
-  - !PublishArtifactStep
+      value: '@build_number@'
-    name: Publish Win64 ZIP
-    sourcePath: Packaging/Windows/build-x64
-    artifacts: TessesCrossLang-*-win64.zip
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   - !CommandStep
     name: Build and Publish Deb Package (Plucky)

Packaging/Windows/build.sh

@@ -4,9 +4,13 @@ cd build-x86
 make -j`nproc`
 cpack -G NSIS
 cpack -G ZIP
+cp TessesCrossLang-*-win32.exe ../../../artifacts/crosslang-win32.exe
+cp TessesCrossLang-*-win32.zip ../../../artifacts/crosslang-win32.zip
 cd ..
 cmake -S ../.. -B build-x64 -DCMAKE_TOOLCHAIN_FILE=`pwd`/WindowsToolchains/x64.cmake -DTESSESFRAMEWORK_FETCHCONTENT=ON -DTESSESFRAMEWORK_ENABLE_APPS=OFF -DTESSESFRAMEWORK_ENABLE_EXAMPLES=OFF -DTESSESFRAMEWORK_ENABLE_STATIC=ON -DTESSESFRAMEWORK_ENABLE_SHARED=OFF -DCMAKE_INSTALL_PREFIX=tmp-x64
 cd build-x64
 make -j`nproc`
 cpack -G NSIS
 cpack -G ZIP
+cp TessesCrossLang-*-win64.exe ../../../artifacts/crosslang-win64.exe
+cp TessesCrossLang-*-win64.zip ../../../artifacts/crosslang-win64.zip