update installer and workflow

next-hat · Dec 28, 2023 · 72668de · 72668de
1 parent 2a519a4
commit 72668de
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/.github/workflows/draft_nightly_nanocl.yml b/.github/workflows/draft_nightly_nanocl.yml
@@ -59,7 +59,7 @@ jobs:
             $BINARY_NAME-$VERSION-$CHANNEL \
             -t $BINARY_NAME-$VERSION-$CHANNEL \
             -F ./bin/$BINARY_NAME/changelog.md \
-            target/debian/${BINARY_NAME}_${VERSION}_amd64.deb#nanocl_amd64.deb
+            target/debian/${BINARY_NAME}_${VERSION}_amd64.deb#nanocl_amd64.deb \
             target/linux/${BINARY_NAME}_${VERSION}_amd64.tar.gz#nanocl_amd64.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}

diff --git a/.github/workflows/draft_stable_nanocl.yml b/.github/workflows/draft_stable_nanocl.yml
@@ -52,13 +52,29 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
       - name: Create new draft release
         if: steps.release-exists.outcome == 'failure' && steps.release-exists.conclusion == 'success'
-        run: gh release create -d $BINARY_NAME-$VERSION -t $BINARY_NAME-$VERSION -F ./bin/$BINARY_NAME/changelog.md target/debian/${BINARY_NAME}_${VERSION}_amd64.deb#nanocl_amd64.deb
+        run: |
+          gh release create -d \
+            $BINARY_NAME-$VERSION-$CHANNEL \
+            -t $BINARY_NAME-$VERSION-$CHANNEL \
+            -F ./bin/$BINARY_NAME/changelog.md \
+            target/debian/${BINARY_NAME}_${VERSION}_amd64.deb#nanocl_amd64.deb \
+            target/linux/${BINARY_NAME}_${VERSION}_amd64.tar.gz#nanocl_amd64.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
       - name: Update draft release
         if: steps.release-exists.outcome == 'success' && steps.release-exists.conclusion == 'success'
         run: |
-          gh release delete-asset -y $BINARY_NAME-$VERSION ${BINARY_NAME}_${VERSION}_amd64.deb || true
-          gh release upload $BINARY_NAME-$VERSION target/debian/${BINARY_NAME}_${VERSION}_amd64.deb#nanocl_amd64.deb
+          gh release delete-asset -y \
+            $BINARY_NAME-$VERSION-$CHANNEL \
+            ${BINARY_NAME}_${VERSION}_amd64.deb
+          gh release delete-asset -y \
+            $BINARY_NAME-$VERSION-$CHANNEL \
+            ${BINARY_NAME}_${VERSION}_amd64.tar.gz || true
+          gh release upload \
+            $BINARY_NAME-$VERSION-$CHANNEL \
+            target/debian/${BINARY_NAME}_${VERSION}_amd64.deb#nanocl_amd64.deb
+          gh release upload \
+            $BINARY_NAME-$VERSION-$CHANNEL \
+            target/linux/${BINARY_NAME}_${VERSION}_amd64.tar.gz#nanocl_amd64.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
diff --git a/installer.yml b/installer.yml
@@ -55,7 +55,7 @@ Cargoes:
     # {% if channel == "nightly" %}
     Image: ghcr.io/next-hat/nproxy:1.25.0-n0.10-nightly
     # {% else %}
-    Image: ghcr.io/next-hat/nproxy:1.25.0.3
+    Image: ghcr.io/next-hat/nproxy:1.25.0-n0.10
     # {% endif %}
     Tty: true
     Env:
@@ -76,7 +76,7 @@ Cargoes:
     # {% if channel == "nightly" %}
     Image: ghcr.io/next-hat/ncproxy:0.10.0-nightly
     # {% else %}
-    Image: ghcr.io/next-hat/ncproxy:0.9.0
+    Image: ghcr.io/next-hat/ncproxy:0.10.0
     # {% endif %}
     Tty: true
     Cmd:
@@ -97,7 +97,7 @@ Cargoes:
     # {% if channel == "nightly" %}
     Image: ghcr.io/next-hat/ndns:2.89.0-n0.5-nightly
     # {% else %}
-    Image: ghcr.io/next-hat/ndns:2.89.0.3
+    Image: ghcr.io/next-hat/ndns:2.89.0-n0.5
     # {% endif %}
     Env:
     - STATE_DIR=${{ state_dir }}/dns
@@ -111,7 +111,7 @@ Cargoes:
     # {% if channel == "nightly" %}
     Image: ghcr.io/next-hat/ncdns:0.5.0-nightly
     # {% else %}
-    Image: ghcr.io/next-hat/ncdns:0.4.0
+    Image: ghcr.io/next-hat/ncdns:0.5.0
     # {% endif %}
     Tty: true
     Cmd:
@@ -136,7 +136,7 @@ Cargoes:
     # {% if channel == "nightly" %}
     Image: ghcr.io/next-hat/nanocld:0.13.0-nightly
     # {% else %}
-    Image: ghcr.io/next-hat/nanocld:0.12.0
+    Image: ghcr.io/next-hat/nanocld:0.13.0
     # {% endif %}
     Tty: true
     Hostname: nanocl.internal
@@ -178,7 +178,7 @@ Cargoes:
     # {% if channel == "nightly" %}
     Image: ghcr.io/next-hat/ncvpnkit:0.3.0-nightly
     # {% else %}
-    Image: ghcr.io/next-hat/ncvpnkit:0.2.0
+    Image: ghcr.io/next-hat/ncvpnkit:0.3.0
     # {% endif %}
     Tty: true
     Hostname: ncvpnkit.nanocl.internal