Merge branch 'main' into dev

napse-invest · Mar 14, 2024 · 5419667 · 5419667
2 parents a3dd49e + af823ea
commit 5419667
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 21 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -10,12 +10,12 @@ jobs:
     strategy:
       matrix:
         include:
-          # - platform: mac
-          #   os: "macos-12"
+          - platform: mac
+            os: "macos-12"
           - platform: linux
             os: "ubuntu-22.04"
-          # - platform: windows
-          #   os: "windows-2022"
+          - platform: windows
+            os: "windows-2022"
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -52,26 +52,30 @@ jobs:
     runs-on: "ubuntu-22.04"
     needs: build
     steps:
-      - name: Tag Docker image
-        run: |
-          TAG_NAME=$(grep -oP '(?<=# \[)[^\]]+' CHANGELOG.md | head -n 1)
-          VERSION=v$TAG_NAME
-          echo "VERSION=$VERSION" >> $GITHUB_ENV
-      
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.release.target_commitish }}
+
       - name: Get all distributables
         uses: actions/download-artifact@v3
 
       - name: Get distributables
         run: |
           mkdir distributables
           cp -r linux-distributables/* distributables/
-          # cp -r mac-distributables/* distributables/
-          # cp -r windows-distributables/* distributables/
+          cp -r mac-distributables/* distributables/
+          cp -r windows-distributables/* distributables/
           ls distributables
-
+      
       - name: Filter out .blockmap files
         run: |
-          find distribuables -name '*.blockmap' -exec rm {} +
+          find distributables -name '*.blockmap' -exec rm {} +
+
+      - name: Tag Docker image
+        run: |
+          TAG_NAME=$(grep -oP '(?<=# \[)[^\]]+' CHANGELOG.md | head -n 1)
+          VERSION=v$TAG_NAME
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Publish all artifacts to GitHub Releases
         uses: softprops/action-gh-release@v1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,24 @@
+## [1.7.11](https://github.com/napse-invest/Napse/compare/v1.7.10...v1.7.11) (2024-03-14)
+
+
+### Bug Fixes
+
+* **ci:** build ([bae11b9](https://github.com/napse-invest/Napse/commit/bae11b9bd4447042e040c90c896811d1371a30c1))
+
+## [1.7.10](https://github.com/napse-invest/Napse/compare/v1.7.9...v1.7.10) (2024-03-14)
+
+
+### Bug Fixes
+
+* **ci:** build ([ca7dc60](https://github.com/napse-invest/Napse/commit/ca7dc60cba4f950749eee8ffa2fb5291c12182f6))
+
+## [1.7.9](https://github.com/napse-invest/Napse/compare/v1.7.8...v1.7.9) (2024-03-14)
+
+
+### Bug Fixes
+
+* **ci:** build ([47c7574](https://github.com/napse-invest/Napse/commit/47c75747ed2afcf6121411281a642f113212796d))
+
 ## [1.7.8](https://github.com/napse-invest/Napse/compare/v1.7.7...v1.7.8) (2024-03-14)
 
 

diff --git a/desktop-app/renderer/pages/fleets/createFleetDialog.tsx b/desktop-app/renderer/pages/fleets/createFleetDialog.tsx
@@ -152,7 +152,7 @@ export default function CreateFleetDialog({
       <DialogContent className="">
         <Form {...form}>
           <form
-            // onSubmit={form.handleSubmit(onSubmitFleet)}
+            onSubmit={form.handleSubmit(onSubmitFleet)}
             className="space-y-2"
           >
             <Carousel className="">
@@ -223,12 +223,7 @@ export default function CreateFleetDialog({
                       clusters={Clusters}
                       setClusters={setClusters}
                     />
-                    <Button
-                      type="submit"
-                      onClick={form.handleSubmit(onSubmitFleet)}
-                    >
-                      Create
-                    </Button>
+                    <Button type="submit">Create</Button>
                   </div>
                 </CarouselItem>
               </CarouselContent>