diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 65e96d8..df16d67 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [macos-latest, ubuntu-20.04, windows-latest] + platform: [macos-latest,ubuntu-latest, ubuntu-20.04, windows-latest] runs-on: ${{ matrix.platform }} steps: @@ -23,7 +23,7 @@ jobs: - name: install Rust stable uses: dtolnay/rust-toolchain@stable - name: install dependencies (ubuntu only) - if: matrix.platform == 'ubuntu-20.04' + if: matrix.platform == 'ubuntu-20.04' || matrix.platform == 'ubuntu-latest' run: | sudo apt-get update sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf @@ -34,7 +34,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version - releaseName: 'App v__VERSION__' + releaseName: 'App v__VERSION__${{matrix.platform}}' releaseBody: 'See the assets to download this version and install.' releaseDraft: true - prerelease: false \ No newline at end of file + prerelease: false diff --git a/README.md b/README.md index 00b4bd9..05753af 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,10 @@ A graphical user interface to aws s3 service. This project is standalone application for connecting to your AWS S3 service. Tested on Mac, Linux, Win 10. +## Installation files +[releases](https://github.com/MassivDash/S3_Manager/releases) + + ## Features ![LightFiles](/screenshots/lightFiles.png?raw=true) @@ -54,7 +58,8 @@ output=json ### Alternate s3 endpoint -Set ```S3_CUSTOM_ENDPOINT``` env vars at your machine to alter the s3 default endpoints +Set env vars ```S3_CUSTOM_ENDPOINT``` to ```true``` or ```1``` at your machine to alter the s3 default endpoints +Set the alternative endpoint url with ```S3_CUSTOM_ENDPOINT_URL``` env ## Local install and development Rust lang (cargo) and node.js (npm or yarn) and tauri-cli instalations are needed to run / build the project from source @@ -78,7 +83,7 @@ Simple division: Rust manages the data and the calls, front end displays the dat Since rust is responsible for making the aws calls you will need the rust "backend" to be started, without it the app will not work. -You will also need need the aws crednetails present on the system +You will also need need the aws credentials present on the system ``` cargo tauri dev ``` diff --git a/package-lock.json b/package-lock.json index bebb98e..d0f7328 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,7 @@ "tailwindcss": "^3.2.4", "tslib": "^2.4.1", "typescript": "^4.9.4", - "vite": "^4.0.4", + "vite": "^4.0.5", "vite-tsconfig-paths": "^4.0.3" } }, @@ -4384,9 +4384,9 @@ "dev": true }, "node_modules/vite": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.0.4.tgz", - "integrity": "sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.0.5.tgz", + "integrity": "sha512-7m87RC+caiAxG+8j3jObveRLqaWA/neAdCat6JAZwMkSWqFHOvg8MYe5fAQxVBRAuKAQ1S6XDh3CBQuLNbY33w==", "dev": true, "dependencies": { "esbuild": "^0.16.3", @@ -4542,9 +4542,9 @@ "dev": true }, "node_modules/yaml": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz", - "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz", + "integrity": "sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==", "engines": { "node": ">= 14" } @@ -7412,9 +7412,9 @@ "dev": true }, "vite": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.0.4.tgz", - "integrity": "sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.0.5.tgz", + "integrity": "sha512-7m87RC+caiAxG+8j3jObveRLqaWA/neAdCat6JAZwMkSWqFHOvg8MYe5fAQxVBRAuKAQ1S6XDh3CBQuLNbY33w==", "dev": true, "requires": { "esbuild": "^0.16.3", @@ -7503,9 +7503,9 @@ "dev": true }, "yaml": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz", - "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==" + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz", + "integrity": "sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==" }, "yocto-queue": { "version": "0.1.0", diff --git a/package.json b/package.json index 25fdeb5..847c141 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "S3_Manager", "private": true, - "version": "0.0.0", + "version": "0.9.5", "type": "module", "scripts": { "dev": "vite", @@ -35,7 +35,7 @@ "tailwindcss": "^3.2.4", "tslib": "^2.4.1", "typescript": "^4.9.4", - "vite": "^4.0.4", + "vite": "^4.0.5", "vite-tsconfig-paths": "^4.0.3" }, "dependencies": { diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 86a0478..c7916f5 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1501,9 +1501,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f" dependencies = [ "bytes", "fnv", @@ -2206,9 +2206,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.43" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020433887e44c27ff16365eaa2d380547a94544ad509aff6eb5b6e3e0b27b376" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ "bitflags", "cfg-if", @@ -2238,11 +2238,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.78" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07d5c8cb6e57b3a3612064d7b18b117912b4ce70955c2504d4b741c9e244b132" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -3384,9 +3383,9 @@ dependencies = [ [[package]] name = "tauri" -version = "1.2.3" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b48820ee3bb6a5031a83b2b6e11f8630bdc5a2f68cb841ab8ebc7a15a916679" +checksum = "e3a1fe72365a6d860fddf3403934649a5157b2bbb6f0b50dd3a8858cd1a22412" dependencies = [ "anyhow", "attohttpc", @@ -3493,9 +3492,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c507d954d08ac8705d235bc70ec6975b9054fb95ff7823af72dbb04186596f3b" +checksum = "dc36898ad4acb6c381878acf903c320a36cf29b68b74f6e791d6045b6557128c" dependencies = [ "gtk", "http", @@ -3506,6 +3505,7 @@ dependencies = [ "serde_json", "tauri-utils", "thiserror", + "url", "uuid 1.2.2", "webview2-com", "windows 0.39.0", @@ -3513,9 +3513,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b1c5764a41a13176a4599b5b7bd0881bea7d94dfe45e1e755f789b98317e30" +checksum = "e2ebc22bc5566ba33310744fadd86709fa591ed163491b165855474523ac1aab" dependencies = [ "cocoa", "gtk", @@ -3524,6 +3524,7 @@ dependencies = [ "raw-window-handle", "tauri-runtime", "tauri-utils", + "url", "uuid 1.2.2", "webkit2gtk", "webview2-com", @@ -4544,9 +4545,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.4" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c" [[package]] name = "xmlparser" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 4137c2c..5d86d83 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "s3_manager" -version = "0.9.3" +version = "0.9.5" description = "S3 Manager: A tool to manage S3 buckets" authors = ["Lukasz Celitan, @SpaceoutPL"] license = "MIT" @@ -17,7 +17,7 @@ tauri-build = { version = "1.2.1", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.2.3", features = ["api-all"] } +tauri = { version = "1.2.5", features = ["api-all"] } aws-config = "0.53.0" aws-sdk-s3 = "0.23.0" tokio-stream = "0.1.11" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index cdd082b..98e84f3 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -9,7 +9,7 @@ }, "package": { "productName": "S3 Manager", - "version": "0.9.3" + "version": "0.9.5" }, "tauri": { "allowlist": {