From 52588f7b9603c1eb79e4d653542ded5c4b19dd51 Mon Sep 17 00:00:00 2001
From: Mike Nolan <tesses@tesses.net>
Date: Fri, 28 Mar 2025 22:30:57 -0500
Subject: [PATCH] Fix buildspec

---
 .onedev-buildspec.yml | 36 +++++++++++++++++++++++++-----------
 Dockerfile            |  4 +++-
 install-docker.sh     |  6 ------
 3 files changed, 28 insertions(+), 18 deletions(-)
 delete mode 100644 install-docker.sh

diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
index af57905..d035b59 100644
--- a/.onedev-buildspec.yml
+++ b/.onedev-buildspec.yml
@@ -8,8 +8,32 @@ jobs:
     withLfs: true
     withSubmodules: true
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !CommandStep
+    name: Build everything
+    runInContainer: true
+    image: onedev.site.tesses.net/crosslang/crosslang:latest
+    interpreter: !DefaultInterpreter
+      commands: |
+        bash ./pack.sh
+    useTTY: true
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !PublishArtifactStep
+    name: Publish shell package
+    artifacts: Tesses.CrossLang.ShellPackage-*.crvm
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !PublishArtifactStep
+    name: Publish Package Server
+    sourcePath: Tesses.CrossLang.PackageServer/bin/
+    artifacts: Tesses.CrossLang.PackageServer-*.crvm
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !PublishArtifactStep
+    name: Publish Website Package
+    sourcePath: Tesses.CrossLang.WebSite/bin
+    artifacts: /Tesses.CrossLang.WebSite-*.crvm
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   - !BuildImageStep
-    name: Build docker image
+    name: Build container
+    dockerfile: Dockerfile
     output: !RegistryOutput
       tags: onedev.site.tesses.net/crosslang/crosslangextras/crosslangextras:latest
     registryLogins:
@@ -17,16 +41,6 @@ jobs:
       userName: '@job_token@'
       passwordSecret: dockersecret
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  - !RunContainerStep
-    name: Copy the artifacts
-    image: onedev.site.tesses.net/crosslang/crosslangextras/crosslangextras:latest
-    args: /bin/bash -c "cp /root/*.crvm $ONEDEV_WORKSPACE"
-    useTTY: true
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  - !PublishArtifactStep
-    name: Publish artifacts
-    artifacts: '*.crvm'
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   triggers:
   - !DependencyFinishedTrigger
     projects: crosslang
diff --git a/Dockerfile b/Dockerfile
index 6742fe8..85b2571 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,5 @@
 FROM onedev.site.tesses.net/crosslang/crosslang:latest
 
-RUN mkdir /src && cd /src && git clone https://onedev.site.tesses.net/crosslang/crosslangextras . && bash ./install-docker.sh && cd / && rm -r /src
\ No newline at end of file
+COPY ./Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm /root/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm
+
+RUN crossarchiveextract /root/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm /root/.config/Tesses/CrossLang
\ No newline at end of file
diff --git a/install-docker.sh b/install-docker.sh
deleted file mode 100644
index fb32077..0000000
--- a/install-docker.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-bash ./script.sh
-crossvm crosslang_shell_archive_maker/bin/crosslang_shell_archive_maker-1.0.0.0-prod.crvm install
-cp Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm /root 
-cp Tesses.CrossLang.PackageServer/bin/Tesses.CrossLang.PackageServer-1.0.0.0-prod.crvm /root
-cp Tesses.CrossLang.WebSite/bin/Tesses.CrossLang.WebSite-1.0.0.0-prod.crvm /root
\ No newline at end of file