diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a7ed7a6..fa054c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,19 +33,26 @@ jobs: steps: - uses: actions/checkout@v4 - - name: install dependencies (ubuntu only) + - name: Fetch App Version from Cargo.toml + if: matrix.settings.platform == 'ubuntu-22.04' + id: drop_version + run: | + export APP_VERSION=$(grep -E '^version\s*=' src-tauri/Cargo.toml | sed -E 's/version\s*=\s*"([^"]+)"/\1/') + echo "app_version=$APP_VERSION" >> "$GITHUB_OUTPUT" + + - name: Install Dependencies (Ubuntu only) if: matrix.settings.platform == 'ubuntu-22.04' # This must match the platform value defined above. run: | sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf - - name: setup node + - name: Setup Node uses: actions/setup-node@v4 with: node-version: lts/* cache: 'npm' # Set this to npm, yarn or pnpm. - - name: install Rust stable + - name: Install Rust stable uses: dtolnay/rust-toolchain@stable with: # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds. @@ -54,7 +61,7 @@ jobs: - name: Rust cache uses: swatinem/rust-cache@v2 - - name: install frontend dependencies + - name: Install Frontend Dependencies # If you don't have `beforeBuildCommand` configured you may want to build your frontend here too. run: npm install # change this to npm or pnpm depending on which one you use. @@ -79,18 +86,32 @@ jobs: uses: actions/upload-artifact@v4 with: name: ark-drop.AppImage - path: ./target/release/bundle/appimage/ark-drop_*_amd64.AppImage + path: ./target/release/bundle/appimage/ARK Drop_${{ steps.drop_version.outputs.app_version }}_amd64.AppImage + + - name: Upload Linux Debian Binary + if: matrix.settings.platform == 'ubuntu-22.04' + uses: actions/upload-artifact@v4 + with: + name: ark-drop.deb + path: ./target/release/bundle/deb/ARK Drop_${{ steps.drop_version.outputs.app_version }}_amd64.deb + + - name: Upload Linux RPM Binary + if: matrix.settings.platform == 'ubuntu-22.04' + uses: actions/upload-artifact@v4 + with: + name: ark-drop.rpm + path: ./target/release/bundle/rpm/ARK Drop-${{ steps.drop_version.outputs.app_version }}-1.x86_64.rpm - - name: Upload MacOS Build (ark-drop.app) + - name: Upload macOS Build (ark-drop.app) uses: actions/upload-artifact@v4 if: matrix.settings.platform == 'macos-latest' with: - name: ark-drop-MacOS.zip + name: ark-drop-macOS.zip path: ./target/universal-apple-darwin/release/bundle/macos - - name: Upload MacOS Build (ark-drop.dmg) + - name: Upload macOS Build (ark-drop.dmg) uses: actions/upload-artifact@v4 if: matrix.settings.platform == 'macos-latest' with: - name: ark-drop-MacOS-dmg.zip + name: ark-drop-macOS-dmg.zip path: ./target/universal-apple-darwin/release/bundle/dmg diff --git a/.gitignore b/.gitignore index 9bc7abc..57d4cd9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ vite.config.js.timestamp-* vite.config.ts.timestamp-* /src-tauri/.ark-drop-data-* target -.vscode \ No newline at end of file +.vscode +.idea \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index d618dd6..ee9494d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2911,20 +2911,6 @@ "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", "license": "ISC" }, - "node_modules/yaml": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz", - "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==", - "license": "ISC", - "optional": true, - "peer": true, - "bin": { - "yaml": "bin.mjs" - }, - "engines": { - "node": ">= 14.6" - } - }, "node_modules/yargs": { "version": "15.4.1", "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 22f7901..2696e65 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -13,7 +13,6 @@ edition = "2021" # This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519 name = "ark_drop_lib" crate-type = ["staticlib", "cdylib", "rlib"] - [build-dependencies] tauri-build = { version = "2.5.1", features = [] } @@ -50,4 +49,3 @@ icon = [ # If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes. # DO NOT REMOVE!! custom-protocol = ["tauri/custom-protocol"] -