build: finish up the workflow for windows & linux (#20)

tsuza · Nov 4, 2024 · bf6ad39 · bf6ad39
1 parent 3efa3ff
commit bf6ad39
Show file tree

Hide file tree

Showing 24 changed files with 588 additions and 162 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,11 +13,11 @@ jobs:
     strategy:
       matrix:
         target:
-          #- target: windows
-          #  os: windows-latest
-          #  make: bash scripts/build-windows-installer.sh
-          #  artifact_path: |
-          #    echo "ARTIFACT_PATH=.temp/mannager-installer.msi" >> $env:GITHUB_ENV
+          - target: windows
+            os: windows-latest
+            make: bash scripts/build-windows-installer.sh
+            artifact_path: |
+              echo "ARTIFACT_PATH=target/release/mannager-installer.msi" >> $env:GITHUB_ENV
           - target: linux
             os: ubuntu-latest
             make: bash scripts/package-linux.sh
@@ -45,6 +45,12 @@ jobs:
             libasound2-dev \
             flatpak-builder
 
+      - name: Install deps with Chocolatey
+        if: matrix.target.target == 'windows'
+        run: |
+          choco install pandoc -y
+          choco install imagemagick -y
+
       - name: Cache cargo registry
         uses: actions/cache@v3
         with:
@@ -97,11 +103,11 @@ jobs:
     strategy:
       matrix:
         target:
-    #      - artifact: windows
-    #        os: windows
-    #        artifact_name: |
-    #          echo "ARTIFACT_NAME=mannager-installer.msi" >> "$GITHUB_ENV"
-    #        asset_type: application/x-dosexec
+          - artifact: windows
+            os: windows
+            artifact_name: |
+              echo "ARTIFACT_NAME=mannager-installer.msi" >> "$GITHUB_ENV"
+            asset_type: application/x-dosexec
           - artifact: linux_tar
             os: linux
             artifact_name: |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,6 +2,9 @@
 name = "mannager"
 edition = "2021"
 version = "0.1.0"
+license = "MIT"
+build = "build.rs"
+edition = "2021"
 
 [dependencies]
 directories = "5.0.1"
@@ -11,15 +14,21 @@ iced_aw = { version = "0.11.0", features = ["number_input", "menu"] }
 notify-rust = "4.11.3"
 open = "5.3.0"
 portforwarder-rs = "0.1.1"
-pty-process = {version = "0.4.0", features = ["async"]}
 reqwest = "0.12.7"
 rfd = "0.15.0"
 scraper = "0.20.0"
-serde = "1.0.210"
-tar = "0.4.42"
+serde = { version = "1.0.210", features = ["derive"] }
 thiserror = "1.0.64"
 tokio = {version = "1.40.0", features = ["full"]}
 toml = "0.8.19"
 unicode-segmentation = "1.0"
 zip = { version = "2.2.0", features = ["deflate-flate2"] }
-dragking = { git = "https://github.com/airstrike/dragking", branch = "on_drag_maybe"}
+dragking = { git = "https://github.com/airstrike/dragking", branch = "on_drag_maybe"}
+
+[target.'cfg(unix)'.dependencies]
+pty-process = {version = "0.4.0", features = ["async"]}
+tar = "0.4.42"
+
+[target.'cfg(windows)'.build-dependencies]
+embed-resource = "2.1.1"
+windows_exe_info = "0.4"
diff --git a/assets/linux/flatpak/generated-sources.json b/assets/linux/flatpak/generated-sources.json
@@ -1661,6 +1661,19 @@
         "dest": "cargo/vendor/either-1.13.0",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "archive",
+        "archive-type": "tar-gzip",
+        "url": "https://static.crates.io/crates/embed-resource/embed-resource-2.5.0.crate",
+        "sha256": "f4e24052d7be71f0efb50c201557f6fe7d237cfd5a64fd5bcd7fd8fe32dbbffa",
+        "dest": "cargo/vendor/embed-resource-2.5.0"
+    },
+    {
+        "type": "inline",
+        "contents": "{\"package\": \"f4e24052d7be71f0efb50c201557f6fe7d237cfd5a64fd5bcd7fd8fe32dbbffa\", \"files\": {}}",
+        "dest": "cargo/vendor/embed-resource-2.5.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -5015,6 +5028,19 @@
         "dest": "cargo/vendor/rustc-hash-2.0.0",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "archive",
+        "archive-type": "tar-gzip",
+        "url": "https://static.crates.io/crates/rustc_version/rustc_version-0.4.1.crate",
+        "sha256": "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92",
+        "dest": "cargo/vendor/rustc_version-0.4.1"
+    },
+    {
+        "type": "inline",
+        "contents": "{\"package\": \"cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92\", \"files\": {}}",
+        "dest": "cargo/vendor/rustc_version-0.4.1",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -5236,6 +5262,19 @@
         "dest": "cargo/vendor/self_cell-1.0.4",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "archive",
+        "archive-type": "tar-gzip",
+        "url": "https://static.crates.io/crates/semver/semver-1.0.23.crate",
+        "sha256": "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b",
+        "dest": "cargo/vendor/semver-1.0.23"
+    },
+    {
+        "type": "inline",
+        "contents": "{\"package\": \"61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b\", \"files\": {}}",
+        "dest": "cargo/vendor/semver-1.0.23",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -6419,6 +6458,32 @@
         "dest": "cargo/vendor/version_check-0.9.5",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "archive",
+        "archive-type": "tar-gzip",
+        "url": "https://static.crates.io/crates/vswhom/vswhom-0.1.0.crate",
+        "sha256": "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b",
+        "dest": "cargo/vendor/vswhom-0.1.0"
+    },
+    {
+        "type": "inline",
+        "contents": "{\"package\": \"be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b\", \"files\": {}}",
+        "dest": "cargo/vendor/vswhom-0.1.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
+    {
+        "type": "archive",
+        "archive-type": "tar-gzip",
+        "url": "https://static.crates.io/crates/vswhom-sys/vswhom-sys-0.1.2.crate",
+        "sha256": "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18",
+        "dest": "cargo/vendor/vswhom-sys-0.1.2"
+    },
+    {
+        "type": "inline",
+        "contents": "{\"package\": \"d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18\", \"files\": {}}",
+        "dest": "cargo/vendor/vswhom-sys-0.1.2",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -7173,6 +7238,19 @@
         "dest": "cargo/vendor/windows_aarch64_msvc-0.52.6",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "archive",
+        "archive-type": "tar-gzip",
+        "url": "https://static.crates.io/crates/windows_exe_info/windows_exe_info-0.4.2.crate",
+        "sha256": "f7e7bfd02caf5cd98a197cec15c852685c8c42605f91d7be3083541a0b40a7ff",
+        "dest": "cargo/vendor/windows_exe_info-0.4.2"
+    },
+    {
+        "type": "inline",
+        "contents": "{\"package\": \"f7e7bfd02caf5cd98a197cec15c852685c8c42605f91d7be3083541a0b40a7ff\", \"files\": {}}",
+        "dest": "cargo/vendor/windows_exe_info-0.4.2",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -7420,6 +7498,19 @@
         "dest": "cargo/vendor/winreg-0.10.1",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "archive",
+        "archive-type": "tar-gzip",
+        "url": "https://static.crates.io/crates/winreg/winreg-0.52.0.crate",
+        "sha256": "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5",
+        "dest": "cargo/vendor/winreg-0.52.0"
+    },
+    {
+        "type": "inline",
+        "contents": "{\"package\": \"a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5\", \"files\": {}}",
+        "dest": "cargo/vendor/winreg-0.52.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",