From eec7d564572941e68c8294863d2c8b731c719bc1 Mon Sep 17 00:00:00 2001 From: Fabian-Lars Date: Wed, 22 May 2024 16:27:08 +0200 Subject: [PATCH] ci: Add v2 tests (#797) * ci: Add v2 tests * fix env var name * and so the logging begins * moar * fix? * lol * rm debug logs --- .github/workflows/test-action.yml | 113 ++++++++++++++++-- .../.gitignore | 0 .../dist/index.html | 0 __fixtures__/{example => example-v1}/icon.png | Bin .../{example => example-v1}/package.json | 2 +- .../{example => example-v2}/.gitignore | 0 .../{example => example-v2}/dist/index.html | 0 __fixtures__/example-v2/icon.png | Bin 0 -> 16244 bytes __fixtures__/example-v2/package.json | 14 +++ __fixtures__/example-with-tauri-v1/.gitignore | 1 + .../example-with-tauri-v1/dist/index.html | 7 ++ .../package.json | 0 .../src-tauri/.gitignore | 0 .../src-tauri/Cargo.toml | 0 .../src-tauri/build.rs | 0 .../src-tauri/icons/128x128.png | Bin .../src-tauri/icons/128x128@2x.png | Bin .../src-tauri/icons/32x32.png | Bin .../src-tauri/icons/Square107x107Logo.png | Bin .../src-tauri/icons/Square142x142Logo.png | Bin .../src-tauri/icons/Square150x150Logo.png | Bin .../src-tauri/icons/Square284x284Logo.png | Bin .../src-tauri/icons/Square30x30Logo.png | Bin .../src-tauri/icons/Square310x310Logo.png | Bin .../src-tauri/icons/Square44x44Logo.png | Bin .../src-tauri/icons/Square71x71Logo.png | Bin .../src-tauri/icons/Square89x89Logo.png | Bin .../src-tauri/icons/StoreLogo.png | Bin .../src-tauri/icons/icon.icns | Bin .../src-tauri/icons/icon.ico | Bin .../src-tauri/icons/icon.png | Bin .../src-tauri/src/main.rs | 0 .../src-tauri/tauri.conf.json | 3 +- __fixtures__/example-with-tauri-v2/.gitignore | 1 + .../example-with-tauri-v2/dist/index.html | 7 ++ .../example-with-tauri-v2/package.json | 14 +++ .../src-tauri/.gitignore | 10 ++ .../src-tauri/Cargo.toml | 19 +++ .../example-with-tauri-v2/src-tauri/build.rs | 3 + .../src-tauri/icons/128x128.png | Bin 0 -> 15920 bytes .../src-tauri/icons/128x128@2x.png | Bin 0 -> 37546 bytes .../src-tauri/icons/32x32.png | Bin 0 -> 2400 bytes .../src-tauri/icons/Square107x107Logo.png | Bin 0 -> 12659 bytes .../src-tauri/icons/Square142x142Logo.png | Bin 0 -> 18057 bytes .../src-tauri/icons/Square150x150Logo.png | Bin 0 -> 19312 bytes .../src-tauri/icons/Square284x284Logo.png | Bin 0 -> 41714 bytes .../src-tauri/icons/Square30x30Logo.png | Bin 0 -> 2132 bytes .../src-tauri/icons/Square310x310Logo.png | Bin 0 -> 45901 bytes .../src-tauri/icons/Square44x44Logo.png | Bin 0 -> 3763 bytes .../src-tauri/icons/Square71x71Logo.png | Bin 0 -> 7380 bytes .../src-tauri/icons/Square89x89Logo.png | Bin 0 -> 9831 bytes .../src-tauri/icons/StoreLogo.png | Bin 0 -> 4552 bytes .../src-tauri/icons/icon.icns | Bin 0 -> 512919 bytes .../src-tauri/icons/icon.ico | Bin 0 -> 57594 bytes .../src-tauri/icons/icon.png | Bin 0 -> 90074 bytes .../src-tauri/src/main.rs | 7 ++ .../src-tauri/tauri.conf.json | 31 +++++ .../example-with-tauri/src-tauri/rustfmt.toml | 13 -- 58 files changed, 220 insertions(+), 25 deletions(-) rename __fixtures__/{example-with-tauri => example-v1}/.gitignore (100%) rename __fixtures__/{example-with-tauri => example-v1}/dist/index.html (100%) rename __fixtures__/{example => example-v1}/icon.png (100%) rename __fixtures__/{example => example-v1}/package.json (91%) rename __fixtures__/{example => example-v2}/.gitignore (100%) rename __fixtures__/{example => example-v2}/dist/index.html (100%) create mode 100644 __fixtures__/example-v2/icon.png create mode 100644 __fixtures__/example-v2/package.json create mode 100644 __fixtures__/example-with-tauri-v1/.gitignore create mode 100644 __fixtures__/example-with-tauri-v1/dist/index.html rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/package.json (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/.gitignore (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/Cargo.toml (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/build.rs (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/128x128.png (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/128x128@2x.png (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/32x32.png (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/Square107x107Logo.png (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/Square142x142Logo.png (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/Square150x150Logo.png (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/Square284x284Logo.png (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/Square30x30Logo.png (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/Square310x310Logo.png (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/Square44x44Logo.png (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/Square71x71Logo.png (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/Square89x89Logo.png (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/StoreLogo.png (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/icon.icns (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/icon.ico (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/icons/icon.png (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/src/main.rs (100%) rename __fixtures__/{example-with-tauri => example-with-tauri-v1}/src-tauri/tauri.conf.json (95%) create mode 100644 __fixtures__/example-with-tauri-v2/.gitignore create mode 100644 __fixtures__/example-with-tauri-v2/dist/index.html create mode 100644 __fixtures__/example-with-tauri-v2/package.json create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/.gitignore create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/Cargo.toml create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/build.rs create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/128x128.png create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/128x128@2x.png create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/32x32.png create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/Square107x107Logo.png create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/Square142x142Logo.png create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/Square150x150Logo.png create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/Square284x284Logo.png create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/Square30x30Logo.png create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/Square310x310Logo.png create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/Square44x44Logo.png create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/Square71x71Logo.png create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/Square89x89Logo.png create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/StoreLogo.png create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/icon.icns create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/icon.ico create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/icons/icon.png create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/src/main.rs create mode 100644 __fixtures__/example-with-tauri-v2/src-tauri/tauri.conf.json delete mode 100644 __fixtures__/example-with-tauri/src-tauri/rustfmt.toml diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 02eb106..276c7cb 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -8,14 +8,14 @@ on: - dev jobs: - build: + v1: strategy: fail-fast: false matrix: include: - platform: 'macos-latest' args: '--verbose --target universal-apple-darwin' - - platform: 'ubuntu-latest' + - platform: 'ubuntu-20.04' args: '--verbose' - platform: 'windows-latest' args: '--verbose' @@ -39,7 +39,7 @@ jobs: # example-with-tauri tests the auto installation of the tauri cli - name: install example dependencies run: pnpm install - working-directory: ./__fixtures__/example + working-directory: ./__fixtures__/example-v1 # rust - name: install Rust stable @@ -51,12 +51,12 @@ jobs: with: cache-on-failure: true workspaces: | - ./__fixtures__/example/src-tauri -> ../../target - ./__fixtures__/example-with-tauri/src-tauri -> ../../target + ./__fixtures__/example-v1/src-tauri -> ../../target + ./__fixtures__/example-with-tauri-v1/src-tauri -> ../../target # system - name: install dependencies (ubuntu only) - if: matrix.platform == 'ubuntu-latest' + if: matrix.platform == 'ubuntu-20.04' run: | sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev @@ -68,11 +68,11 @@ jobs: # Updater signature is exposed here to make sure it works in PR's TAURI_PRIVATE_KEY: dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5YTBGV3JiTy9lRDZVd3NkL0RoQ1htZmExNDd3RmJaNmRMT1ZGVjczWTBKZ0FBQkFBQUFBQUFBQUFBQUlBQUFBQWdMekUzVkE4K0tWQ1hjeGt1Vkx2QnRUR3pzQjVuV0ZpM2czWXNkRm9hVUxrVnB6TUN3K1NheHJMREhQbUVWVFZRK3NIL1VsMDBHNW5ET1EzQno0UStSb21nRW4vZlpTaXIwZFh5ZmRlL1lSN0dKcHdyOUVPclVvdzFhVkxDVnZrbHM2T1o4Tk1NWEU9Cg== with: - projectPath: ./__fixtures__/example-with-tauri + projectPath: ./__fixtures__/example-with-tauri-v1 includeDebug: true includeRelease: false tagName: ${{ github.event.pull_request.head.repo.full_name == github.repository && 'example-with-tauri-v__VERSION__' || '' }} - releaseName: 'Release example with preconfigured Tauri app v__VERSION__' + releaseName: 'Release example with preconfigured Tauri app v__VERSION__ for tauri-v1' releaseBody: 'See the assets to download this version and install.' releaseDraft: true args: ${{ matrix.args }} @@ -84,7 +84,7 @@ jobs: # Updater signature is exposed here to make sure it works in PR's TAURI_PRIVATE_KEY: dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5YTBGV3JiTy9lRDZVd3NkL0RoQ1htZmExNDd3RmJaNmRMT1ZGVjczWTBKZ0FBQkFBQUFBQUFBQUFBQUlBQUFBQWdMekUzVkE4K0tWQ1hjeGt1Vkx2QnRUR3pzQjVuV0ZpM2czWXNkRm9hVUxrVnB6TUN3K1NheHJMREhQbUVWVFZRK3NIL1VsMDBHNW5ET1EzQno0UStSb21nRW4vZlpTaXIwZFh5ZmRlL1lSN0dKcHdyOUVPclVvdzFhVkxDVnZrbHM2T1o4Tk1NWEU9Cg== with: - projectPath: ./__fixtures__/example + projectPath: ./__fixtures__/example-v1 distPath: ../dist # relative to tauri.conf.json iconPath: ./icon.png # relative to projectPath bundleIdentifier: com.tauri.actiontest @@ -93,7 +93,100 @@ jobs: includeDebug: true includeRelease: false tagName: ${{ github.event.pull_request.head.repo.full_name == github.repository && 'example-v__VERSION__' || '' }} - releaseName: 'Release example app v__VERSION__' + releaseName: 'Release example app v__VERSION__ for tauri-v1' + releaseBody: 'See the assets to download this version and install.' + releaseDraft: true + args: ${{ matrix.args }} + + v2: + strategy: + fail-fast: false + matrix: + include: + - platform: 'macos-latest' + args: '--verbose --target universal-apple-darwin' + - platform: 'ubuntu-22.04' + args: '--verbose' + - platform: 'windows-latest' + args: '--verbose' + + runs-on: ${{ matrix.platform }} + steps: + - uses: actions/checkout@v4 + + # node + - name: install pnpm + uses: pnpm/action-setup@v4 + with: + version: 9.x.x + + - name: setup node + uses: actions/setup-node@v4 + with: + node-version: lts/* + cache: pnpm + + # TODO: example-with-tauri tests the auto installation of the tauri cli + - name: install example dependencies + run: | + cd ./__fixtures__/example-v2 + pnpm install + cd ../example-with-tauri-v2 + pnpm install + + # rust + - name: install Rust stable + uses: dtolnay/rust-toolchain@stable + with: + targets: aarch64-apple-darwin,x86_64-apple-darwin + + - uses: Swatinem/rust-cache@v2 + with: + cache-on-failure: true + workspaces: | + ./__fixtures__/example-v2/src-tauri -> ../../target + ./__fixtures__/example-with-tauri-v2/src-tauri -> ../../target + + # system + - name: install dependencies (ubuntu only) + if: matrix.platform == 'ubuntu-22.04' + run: | + sudo apt-get update + sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev + + - name: Preconfigured Tauri Project + uses: ./ + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Updater signature is exposed here to make sure it works in PR's + TAURI_SIGNING_PRIVATE_KEY: dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5YTBGV3JiTy9lRDZVd3NkL0RoQ1htZmExNDd3RmJaNmRMT1ZGVjczWTBKZ0FBQkFBQUFBQUFBQUFBQUlBQUFBQWdMekUzVkE4K0tWQ1hjeGt1Vkx2QnRUR3pzQjVuV0ZpM2czWXNkRm9hVUxrVnB6TUN3K1NheHJMREhQbUVWVFZRK3NIL1VsMDBHNW5ET1EzQno0UStSb21nRW4vZlpTaXIwZFh5ZmRlL1lSN0dKcHdyOUVPclVvdzFhVkxDVnZrbHM2T1o4Tk1NWEU9Cg== + with: + projectPath: ./__fixtures__/example-with-tauri-v2 + includeDebug: true + includeRelease: false + tagName: ${{ github.event.pull_request.head.repo.full_name == github.repository && 'example-with-tauri-v__VERSION__' || '' }} + releaseName: 'Release example with preconfigured Tauri app v__VERSION__ for tauri-v2' + releaseBody: 'See the assets to download this version and install.' + releaseDraft: true + args: ${{ matrix.args }} + + - name: Frontend-only Project + uses: ./ + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Updater signature is exposed here to make sure it works in PR's + TAURI_SIGNING_PRIVATE_KEY: dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5YTBGV3JiTy9lRDZVd3NkL0RoQ1htZmExNDd3RmJaNmRMT1ZGVjczWTBKZ0FBQkFBQUFBQUFBQUFBQUlBQUFBQWdMekUzVkE4K0tWQ1hjeGt1Vkx2QnRUR3pzQjVuV0ZpM2czWXNkRm9hVUxrVnB6TUN3K1NheHJMREhQbUVWVFZRK3NIL1VsMDBHNW5ET1EzQno0UStSb21nRW4vZlpTaXIwZFh5ZmRlL1lSN0dKcHdyOUVPclVvdzFhVkxDVnZrbHM2T1o4Tk1NWEU9Cg== + with: + projectPath: ./__fixtures__/example-v2 + distPath: ../dist # relative to tauri.conf.json + iconPath: ./icon.png # relative to projectPath + bundleIdentifier: com.tauri.actiontest + appName: example + appVersion: ../package.json # relative to tauri.conf.json + includeDebug: true + includeRelease: false + tagName: ${{ github.event.pull_request.head.repo.full_name == github.repository && 'example-v__VERSION__' || '' }} + releaseName: 'Release example app v__VERSION__ for tauri-v2' releaseBody: 'See the assets to download this version and install.' releaseDraft: true args: ${{ matrix.args }} diff --git a/__fixtures__/example-with-tauri/.gitignore b/__fixtures__/example-v1/.gitignore similarity index 100% rename from __fixtures__/example-with-tauri/.gitignore rename to __fixtures__/example-v1/.gitignore diff --git a/__fixtures__/example-with-tauri/dist/index.html b/__fixtures__/example-v1/dist/index.html similarity index 100% rename from __fixtures__/example-with-tauri/dist/index.html rename to __fixtures__/example-v1/dist/index.html diff --git a/__fixtures__/example/icon.png b/__fixtures__/example-v1/icon.png similarity index 100% rename from __fixtures__/example/icon.png rename to __fixtures__/example-v1/icon.png diff --git a/__fixtures__/example/package.json b/__fixtures__/example-v1/package.json similarity index 91% rename from __fixtures__/example/package.json rename to __fixtures__/example-v1/package.json index 71c8e97..ddf16d6 100644 --- a/__fixtures__/example/package.json +++ b/__fixtures__/example-v1/package.json @@ -1,6 +1,6 @@ { "name": "example", - "version": "0.1.1", + "version": "0.0.1", "description": "", "main": "index.js", "scripts": { diff --git a/__fixtures__/example/.gitignore b/__fixtures__/example-v2/.gitignore similarity index 100% rename from __fixtures__/example/.gitignore rename to __fixtures__/example-v2/.gitignore diff --git a/__fixtures__/example/dist/index.html b/__fixtures__/example-v2/dist/index.html similarity index 100% rename from __fixtures__/example/dist/index.html rename to __fixtures__/example-v2/dist/index.html diff --git a/__fixtures__/example-v2/icon.png b/__fixtures__/example-v2/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..736feb35fac1eda5d6b350de64fe1323654a5e69 GIT binary patch literal 16244 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 literal 0 HcmV?d00001 diff --git a/__fixtures__/example-v2/package.json b/__fixtures__/example-v2/package.json new file mode 100644 index 0000000..abf79ef --- /dev/null +++ b/__fixtures__/example-v2/package.json @@ -0,0 +1,14 @@ +{ + "name": "example", + "version": "0.0.2", + "description": "", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "MIT", + "dependencies": { + "@tauri-apps/cli": "next" + } +} diff --git a/__fixtures__/example-with-tauri-v1/.gitignore b/__fixtures__/example-with-tauri-v1/.gitignore new file mode 100644 index 0000000..2b1fa6c --- /dev/null +++ b/__fixtures__/example-with-tauri-v1/.gitignore @@ -0,0 +1 @@ +dist/index.tauri.html \ No newline at end of file diff --git a/__fixtures__/example-with-tauri-v1/dist/index.html b/__fixtures__/example-with-tauri-v1/dist/index.html new file mode 100644 index 0000000..01744e2 --- /dev/null +++ b/__fixtures__/example-with-tauri-v1/dist/index.html @@ -0,0 +1,7 @@ + + + + +

Hello!

+ + diff --git a/__fixtures__/example-with-tauri/package.json b/__fixtures__/example-with-tauri-v1/package.json similarity index 100% rename from __fixtures__/example-with-tauri/package.json rename to __fixtures__/example-with-tauri-v1/package.json diff --git a/__fixtures__/example-with-tauri/src-tauri/.gitignore b/__fixtures__/example-with-tauri-v1/src-tauri/.gitignore similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/.gitignore rename to __fixtures__/example-with-tauri-v1/src-tauri/.gitignore diff --git a/__fixtures__/example-with-tauri/src-tauri/Cargo.toml b/__fixtures__/example-with-tauri-v1/src-tauri/Cargo.toml similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/Cargo.toml rename to __fixtures__/example-with-tauri-v1/src-tauri/Cargo.toml diff --git a/__fixtures__/example-with-tauri/src-tauri/build.rs b/__fixtures__/example-with-tauri-v1/src-tauri/build.rs similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/build.rs rename to __fixtures__/example-with-tauri-v1/src-tauri/build.rs diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/128x128.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/128x128.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/128x128.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/128x128.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/128x128@2x.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/128x128@2x.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/128x128@2x.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/128x128@2x.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/32x32.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/32x32.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/32x32.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/32x32.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square107x107Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square107x107Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square107x107Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square107x107Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square142x142Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square142x142Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square142x142Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square142x142Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square150x150Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square150x150Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square150x150Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square150x150Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square284x284Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square284x284Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square284x284Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square284x284Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square30x30Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square30x30Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square30x30Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square30x30Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square310x310Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square310x310Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square310x310Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square310x310Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square44x44Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square44x44Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square44x44Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square44x44Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square71x71Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square71x71Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square71x71Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square71x71Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/Square89x89Logo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/Square89x89Logo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/Square89x89Logo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/Square89x89Logo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/StoreLogo.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/StoreLogo.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/StoreLogo.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/StoreLogo.png diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/icon.icns b/__fixtures__/example-with-tauri-v1/src-tauri/icons/icon.icns similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/icon.icns rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/icon.icns diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/icon.ico b/__fixtures__/example-with-tauri-v1/src-tauri/icons/icon.ico similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/icon.ico rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/icon.ico diff --git a/__fixtures__/example-with-tauri/src-tauri/icons/icon.png b/__fixtures__/example-with-tauri-v1/src-tauri/icons/icon.png similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/icons/icon.png rename to __fixtures__/example-with-tauri-v1/src-tauri/icons/icon.png diff --git a/__fixtures__/example-with-tauri/src-tauri/src/main.rs b/__fixtures__/example-with-tauri-v1/src-tauri/src/main.rs similarity index 100% rename from __fixtures__/example-with-tauri/src-tauri/src/main.rs rename to __fixtures__/example-with-tauri-v1/src-tauri/src/main.rs diff --git a/__fixtures__/example-with-tauri/src-tauri/tauri.conf.json b/__fixtures__/example-with-tauri-v1/src-tauri/tauri.conf.json similarity index 95% rename from __fixtures__/example-with-tauri/src-tauri/tauri.conf.json rename to __fixtures__/example-with-tauri-v1/src-tauri/tauri.conf.json index 1b76f20..fa7f92f 100644 --- a/__fixtures__/example-with-tauri/src-tauri/tauri.conf.json +++ b/__fixtures__/example-with-tauri-v1/src-tauri/tauri.conf.json @@ -6,7 +6,8 @@ "beforeBuildCommand": "" }, "package": { - "productName": "TauriExample App" + "productName": "TauriExample App", + "version": "0.1.1" }, "tauri": { "bundle": { diff --git a/__fixtures__/example-with-tauri-v2/.gitignore b/__fixtures__/example-with-tauri-v2/.gitignore new file mode 100644 index 0000000..2b1fa6c --- /dev/null +++ b/__fixtures__/example-with-tauri-v2/.gitignore @@ -0,0 +1 @@ +dist/index.tauri.html \ No newline at end of file diff --git a/__fixtures__/example-with-tauri-v2/dist/index.html b/__fixtures__/example-with-tauri-v2/dist/index.html new file mode 100644 index 0000000..01744e2 --- /dev/null +++ b/__fixtures__/example-with-tauri-v2/dist/index.html @@ -0,0 +1,7 @@ + + + + +

Hello!

+ + diff --git a/__fixtures__/example-with-tauri-v2/package.json b/__fixtures__/example-with-tauri-v2/package.json new file mode 100644 index 0000000..40886fb --- /dev/null +++ b/__fixtures__/example-with-tauri-v2/package.json @@ -0,0 +1,14 @@ +{ + "name": "example-with-tauri", + "version": "0.1.1", + "description": "", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "MIT", + "dependencies": { + "@tauri-apps/cli": "next" + } +} \ No newline at end of file diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/.gitignore b/__fixtures__/example-with-tauri-v2/src-tauri/.gitignore new file mode 100644 index 0000000..270a92d --- /dev/null +++ b/__fixtures__/example-with-tauri-v2/src-tauri/.gitignore @@ -0,0 +1,10 @@ +# Generated by Cargo +# will have compiled files and executables +/target/ +WixTools + +# These are backup files generated by rustfmt +**/*.rs.bk + +config.json +bundle.json diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/Cargo.toml b/__fixtures__/example-with-tauri-v2/src-tauri/Cargo.toml new file mode 100644 index 0000000..4c3f7b8 --- /dev/null +++ b/__fixtures__/example-with-tauri-v2/src-tauri/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "test-app" +version = "0.1.0" +description = "A Tauri App" +authors = [ "you" ] +license = "" +repository = "" +edition = "2021" + +[dependencies] +serde_json = "1" +serde = { version = "1", features = [ "derive" ] } +tauri = { version = "2.0.0-beta", features = [] } + +[build-dependencies] +tauri-build = { version = "2.0.0-beta", features = [] } + +[features] +prod = [ "tauri/custom-protocol" ] diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/build.rs b/__fixtures__/example-with-tauri-v2/src-tauri/build.rs new file mode 100644 index 0000000..795b9b7 --- /dev/null +++ b/__fixtures__/example-with-tauri-v2/src-tauri/build.rs @@ -0,0 +1,3 @@ +fn main() { + tauri_build::build() +} diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/128x128.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/128x128.png new file mode 100644 index 0000000000000000000000000000000000000000..f8d9962cc21930b871430f46b7dca842cb6c6f6d GIT binary patch literal 15920 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 F{||SSwqO7N literal 0 HcmV?d00001 diff --git a/__fixtures__/example-with-tauri-v2/src-tauri/icons/128x128@2x.png b/__fixtures__/example-with-tauri-v2/src-tauri/icons/128x128@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..44d26d04b6f60f5cc6ead44f15d30f80fd348b28 GIT binary patch literal 37546 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