diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml deleted file mode 100644 index 0db08a0..0000000 --- a/.github/workflows/clippy.yml +++ /dev/null @@ -1,23 +0,0 @@ -on: push -name: Clippy check -jobs: - clippy_check: - runs-on: ubuntu-24.04 - permissions: - checks: write - steps: - - uses: actions/checkout@v1 - - name: install dependencies (ubuntu only) - run: | - sudo apt-get update - sudo apt-get install -y libglib2.0-dev libgtk-3-dev libwebkit2gtk-4.1-dev - - - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - components: clippy - override: true - - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --manifest-path ./src-tauri/Cargo.toml \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 34d41f8..5fdbc90 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,9 +22,9 @@ jobs: args: '--target aarch64-apple-darwin' - platform: 'macos-latest' # for Intel based macs. args: '--target x86_64-apple-darwin' - - platform: 'ubuntu-22.04' # for Tauri v1 you could replace this with ubuntu-20.04. + - platform: 'ubuntu-24.04' # for Tauri v1 you could replace this with ubuntu-20.04. args: '' - - platform: 'ubuntu-22.04-arm' + - platform: 'ubuntu-24.04-arm' args: '--target aarch64-unknown-linux-gnu' - platform: 'windows-latest' args: '' @@ -48,42 +48,12 @@ jobs: targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} - name: install dependencies (ubuntu only) - if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm' # This must match the platform value defined above. + if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above. run: | sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf xdg-utils + sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libgtk2.0-dev libsoup3.0-dev # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2. - - - - name: Import Apple Developer Certificate - if: matrix.platform == 'macos-latest' - env: - APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} - APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }} - KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} - run: | - echo $APPLE_CERTIFICATE | base64 --decode > certificate.p12 - security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain - security default-keychain -s build.keychain - security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain - security set-keychain-settings -t 3600 -u build.keychain - - curl https://droposs.org/drop.crt --output drop.pem - sudo security authorizationdb write com.apple.trust-settings.user allow - security add-trusted-cert -r trustRoot -k build.keychain -p codeSign -u -1 drop.pem - sudo security authorizationdb remove com.apple.trust-settings.user - - security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign - security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain - security find-identity -v -p codesigning build.keychain - - - name: Verify Certificate - if: matrix.platform == 'macos-latest' - run: | - CERT_INFO=$(security find-identity -v -p codesigning build.keychain | grep "Drop OSS") - CERT_ID=$(echo "$CERT_INFO" | awk -F'"' '{print $2}') - echo "CERT_ID=$CERT_ID" >> $GITHUB_ENV - echo "Certificate imported. Using identity: $CERT_ID" + # You can remove the one that doesn't apply to your app to speed up the workflow a bit. - name: install frontend dependencies run: yarn install # change this to npm, pnpm or bun depending on which one you use. @@ -91,14 +61,10 @@ jobs: - uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} - APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }} - APPLE_SIGNING_IDENTITY: ${{ env.CERT_ID }} - NO_STRIP: true with: tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version. releaseName: 'Auto-release v__VERSION__' releaseBody: 'See the assets to download this version and install. This release was created automatically.' releaseDraft: false prerelease: true - args: ${{ matrix.args }} \ No newline at end of file + args: ${{ matrix.args }} diff --git a/.gitignore b/.gitignore index c60be72..5767a3f 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,4 @@ dist-ssr .output src-tauri/flamegraph.svg -src-tauri/perf* - -/*.AppImage -/squashfs-root \ No newline at end of file +src-tauri/perf* \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index df4511d..f47083b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,9 @@ +[submodule "drop-base"] + path = drop-base + url = https://github.com/drop-oss/drop-base [submodule "src-tauri/tailscale/libtailscale"] path = src-tauri/tailscale/libtailscale url = https://github.com/tailscale/libtailscale.git -[submodule "libs/drop-base"] - path = libs/drop-base - url = https://github.com/drop-oss/drop-base.git +[submodule "src-tauri/umu/umu-launcher"] + path = src-tauri/umu/umu-launcher + url = https://github.com/Open-Wine-Components/umu-launcher.git diff --git a/README.md b/README.md index f66cea8..903f4ca 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Drop app is the companion app for [Drop](https://github.com/Drop-OSS/drop). It u ## Running Before setting up the drop app, be sure that you have a server set up. -The instructions for this can be found on the [Drop Docs](https://docs.droposs.org/docs/guides/quickstart) +The instructions for this can be found on the [Drop Wiki](https://wiki.droposs.org/guides/quickstart.html) ## Current features Currently supported are the following features: diff --git a/main/app.vue b/app.vue similarity index 68% rename from main/app.vue rename to app.vue index 7d4165f..b9011c6 100644 --- a/main/app.vue +++ b/app.vue @@ -1,5 +1,4 @@