diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 570d73a69..de7bd7f3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -322,6 +322,9 @@ jobs: # includes the updater, and that anything we changed with the target # does not persist rm -rf src-tauri/target + # Lets get rid of the info.plist for the normal mac builds since its + # being sketchy. + rm src-tauri/Info.plist # We do this after the apple store because the apple store build is # specific and we want to overwrite it with the this new build after and @@ -338,8 +341,9 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + TAURI_CONF_ARGS: "--config ${{ matrix.os == 'windows-latest' && 'src-tauri\\tauri.release.conf.json' || 'src-tauri/tauri.release.conf.json' }}" with: - args: "${{ env.TAURI_ARGS_MACOS }} ${{ env.TAURI_ARGS_UBUNTU }}" + args: "${{ env.TAURI_CONF_ARGS }} ${{ env.TAURI_ARGS_MACOS }} ${{ env.TAURI_ARGS_UBUNTU }}" - uses: actions/upload-artifact@v3 if: matrix.os != 'ubuntu-latest' diff --git a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-rectangles-should-look-right-1-Google-Chrome-linux.png b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-rectangles-should-look-right-1-Google-Chrome-linux.png index 118f49ee5..576024ec2 100644 Binary files a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-rectangles-should-look-right-1-Google-Chrome-linux.png and b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-rectangles-should-look-right-1-Google-Chrome-linux.png differ diff --git a/package.json b/package.json index efd578a18..170416973 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "untitled-app", - "version": "0.19.4", + "version": "0.20.0", "private": true, "dependencies": { "@codemirror/autocomplete": "^6.16.0", diff --git a/src-tauri/entitlements/general.entitlements b/src-tauri/entitlements/general.entitlements deleted file mode 100644 index cc2e2f909..000000000 --- a/src-tauri/entitlements/general.entitlements +++ /dev/null @@ -1,14 +0,0 @@ - - - - - com.apple.application-identifier - 92H8YB3B95.dev.zoo.modeling-app - com.apple.developer.team-identifier - 92H8YB3B95 - com.apple.developer.associated-domains - - applinks:app.zoo.dev - - - diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 592cdae73..afd7d95ee 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -38,7 +38,6 @@ }, "longDescription": "", "macOS": { - "entitlements": "entitlements/general.entitlements" }, "resources": [], "shortDescription": "", @@ -76,5 +75,5 @@ } }, "productName": "Zoo Modeling App", - "version": "0.19.4" + "version": "0.20.0" }