From cd04d251bf9eb6b9a7d349c10b025f3c6d52c8c5 Mon Sep 17 00:00:00 2001 From: abs2023 Date: Tue, 10 Dec 2024 11:13:01 -0500 Subject: [PATCH 1/5] update $VFULL var in windows build --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a10df9b..21b43f2a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -398,14 +398,14 @@ jobs: wget -nv https://github.com/ggerganov/llama.cpp/releases/download/b3256/$LLAMACPP wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL unzip -o -j $LLAMACPP llama-server.exe llama.dll ggml.dll - echo '{"run":["./llama-server.exe -m ./'$MODEL'","./proxy-router.exe","./morpheus-ui-${VFULL}-x64-win.exe"]}' > mor-launch.json + echo '{"run":["./llama-server.exe -m ./'$MODEL'","./proxy-router.exe","./morpheus-ui-$VFULL-x64-win.exe"]}' > mor-launch.json mv .env .env.tmp sed 's|\./data/|.\\data\\|g' .env.tmp > .env mv ./proxy-router/bin/proxy-router proxy-router.exe mv ./cli/mor-cli mor-cli.exe mv ./launcher/mor-launch mor-launch.exe - mv "./ui-desktop/dist/morpheus-ui-${VFULL}-x64-win" morpheus-ui-${VFULL}-x64-win.exe - 7z a $ARTIFACT LICENSE mor-launch.exe proxy-router.exe .env llama-server.exe llama.dll ggml.dll $MODEL mor-launch.json morpheus-ui-${VFULL}-x64-win.exe models-config.json rating-config.json mor-cli.exe + mv "./ui-desktop/dist/morpheus-ui-$VFULL-x64-win" morpheus-ui-$VFULL-x64-win.exe + 7z a $ARTIFACT LICENSE mor-launch.exe proxy-router.exe .env llama-server.exe llama.dll ggml.dll $MODEL mor-launch.json morpheus-ui-$VFULL-x64-win.exe models-config.json rating-config.json mor-cli.exe - name: Upload artifacts uses: actions/upload-artifact@v4 From ead449018901391d4ec08e8771bdd29b9c6dcd54 Mon Sep 17 00:00:00 2001 From: abs2023 Date: Tue, 10 Dec 2024 11:21:57 -0500 Subject: [PATCH 2/5] update ubuntu artifact for ${VFULL} --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 21b43f2a..a05548c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -159,9 +159,9 @@ jobs: wget -nv https://github.com/ggerganov/llama.cpp/releases/download/b3256/$LLAMACPP wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL unzip -o -j $LLAMACPP build/bin/llama-server - echo '{"run":["./llama-server -m ./'$MODEL'","./proxy-router","./morpheus-ui-${VFULL}-x86_64-linux.AppImage"]}' > mor-launch.json + echo '{"run":["./llama-server -m ./'$MODEL'","./proxy-router","./morpheus-ui-$VFULL-x86_64-linux.AppImage"]}' > mor-launch.json mv ./cli/mor-cli mor-cli - zip -j $ARTIFACT ./LICENSE ./launcher/mor-launch llama-server ./proxy-router/bin/proxy-router .env $MODEL mor-launch.json ./ui-desktop/dist/morpheus-ui-${VFULL}-x86_64-linux.AppImage models-config.json rating-config.json mor-cli + zip -j $ARTIFACT ./LICENSE ./launcher/mor-launch llama-server ./proxy-router/bin/proxy-router .env $MODEL mor-launch.json ./ui-desktop/dist/morpheus-ui-$VFULL-x86_64-linux.AppImage models-config.json rating-config.json mor-cli - name: Upload artifacts uses: actions/upload-artifact@v4 From 6078eaa33523569ac9ee7d4ff29868102caf8baa Mon Sep 17 00:00:00 2001 From: abs2023 Date: Tue, 10 Dec 2024 11:24:30 -0500 Subject: [PATCH 3/5] added mor-launch.json inspection --- .github/workflows/build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a05548c6..9a733b34 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -160,6 +160,8 @@ jobs: wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL unzip -o -j $LLAMACPP build/bin/llama-server echo '{"run":["./llama-server -m ./'$MODEL'","./proxy-router","./morpheus-ui-$VFULL-x86_64-linux.AppImage"]}' > mor-launch.json + echo "Contents of mor-launch.json: " + cat mor-launch.json mv ./cli/mor-cli mor-cli zip -j $ARTIFACT ./LICENSE ./launcher/mor-launch llama-server ./proxy-router/bin/proxy-router .env $MODEL mor-launch.json ./ui-desktop/dist/morpheus-ui-$VFULL-x86_64-linux.AppImage models-config.json rating-config.json mor-cli @@ -237,6 +239,8 @@ jobs: wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL unzip -o -j $LLAMACPP build/bin/llama-server echo '{"run":["./llama-server -m ./'$MODEL'","./proxy-router","./MorpheusUI.app/Contents/MacOS/MorpheusUI"]}' > mor-launch.json + echo "Contents of mor-launch.json: " + cat mor-launch.json mv ./cli/mor-cli mor-cli unzip ./ui-desktop/dist/morpheus-ui-${VFULL}-x64-mac.zip zip -j $ARTIFACT ./LICENSE ./launcher/mor-launch ./proxy-router/bin/proxy-router .env llama-server $MODEL mor-launch.json models-config.json rating-config.json mor-cli @@ -316,6 +320,8 @@ jobs: wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL unzip -o -j $LLAMACPP build/bin/llama-server echo '{"run":["./llama-server -m ./'$MODEL'","./proxy-router","./MorpheusUI.app/Contents/MacOS/MorpheusUI"]}' > mor-launch.json + echo "Contents of mor-launch.json: " + cat mor-launch.json mv ./cli/mor-cli mor-cli unzip ./ui-desktop/dist/morpheus-ui-${VFULL}-arm64-mac.zip zip -j $ARTIFACT ./LICENSE ./launcher/mor-launch ./proxy-router/bin/proxy-router .env llama-server $MODEL mor-launch.json models-config.json rating-config.json mor-cli @@ -399,6 +405,8 @@ jobs: wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL unzip -o -j $LLAMACPP llama-server.exe llama.dll ggml.dll echo '{"run":["./llama-server.exe -m ./'$MODEL'","./proxy-router.exe","./morpheus-ui-$VFULL-x64-win.exe"]}' > mor-launch.json + echo "Contents of mor-launch.json: " + cat mor-launch.json mv .env .env.tmp sed 's|\./data/|.\\data\\|g' .env.tmp > .env mv ./proxy-router/bin/proxy-router proxy-router.exe From 073e5c92779f589a93241e6ffe755770574b62f5 Mon Sep 17 00:00:00 2001 From: abs2023 Date: Tue, 10 Dec 2024 11:45:27 -0500 Subject: [PATCH 4/5] reset local job vfull and better escape --- .github/workflows/build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a733b34..189fb8ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -152,6 +152,8 @@ jobs: - name: Pack artifacts id: pack_artifacts run: | + VFULL=${VFULL:-0.0.1} + echo "VFULL: $VFULL" ARTIFACT="mor-launch-$TAG_NAME-ubuntu-x64.zip" echo "Artifact: $ARTIFACT" LLAMACPP=llama-b3256-bin-ubuntu-x64.zip @@ -159,7 +161,7 @@ jobs: wget -nv https://github.com/ggerganov/llama.cpp/releases/download/b3256/$LLAMACPP wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL unzip -o -j $LLAMACPP build/bin/llama-server - echo '{"run":["./llama-server -m ./'$MODEL'","./proxy-router","./morpheus-ui-$VFULL-x86_64-linux.AppImage"]}' > mor-launch.json + echo '{"run":["./llama-server -m ./'"$MODEL"'","./proxy-router","./morpheus-ui-'"$VFULL"'-x86_64-linux.AppImage"]}' > mor-launch.json echo "Contents of mor-launch.json: " cat mor-launch.json mv ./cli/mor-cli mor-cli @@ -397,14 +399,15 @@ jobs: - name: Pack artifacts id: pack_artifacts run: | - ARTIFACT="mor-launch-$TAG_NAME-win-x64.zip" + VFULL=${VFULL:-0.0.1} + echo "VFULL: $VFULL"ARTIFACT="mor-launch-$TAG_NAME-win-x64.zip" echo "Artifact: $ARTIFACT" LLAMACPP=llama-b3256-bin-win-avx2-x64.zip MODEL=tinyllama-1.1b-chat-v1.0.Q4_K_M.gguf wget -nv https://github.com/ggerganov/llama.cpp/releases/download/b3256/$LLAMACPP wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL unzip -o -j $LLAMACPP llama-server.exe llama.dll ggml.dll - echo '{"run":["./llama-server.exe -m ./'$MODEL'","./proxy-router.exe","./morpheus-ui-$VFULL-x64-win.exe"]}' > mor-launch.json + echo '{"run":["./llama-server.exe -m ./'"$MODEL"'","./proxy-router.exe","./morpheus-ui-'"$VFULL"'-x64-win.exe"]}' > mor-launch.json echo "Contents of mor-launch.json: " cat mor-launch.json mv .env .env.tmp From 26e9ce91fbf962fececcd0d93d3b2075dd7c6819 Mon Sep 17 00:00:00 2001 From: abs2023 Date: Tue, 10 Dec 2024 12:12:20 -0500 Subject: [PATCH 5/5] fix windows artifact output --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 189fb8ac..982f6573 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -400,7 +400,8 @@ jobs: id: pack_artifacts run: | VFULL=${VFULL:-0.0.1} - echo "VFULL: $VFULL"ARTIFACT="mor-launch-$TAG_NAME-win-x64.zip" + echo "VFULL: $VFULL" + ARTIFACT="mor-launch-$TAG_NAME-win-x64.zip" echo "Artifact: $ARTIFACT" LLAMACPP=llama-b3256-bin-win-avx2-x64.zip MODEL=tinyllama-1.1b-chat-v1.0.Q4_K_M.gguf