Skip to content

Commit 35264e9

Browse files
authored
Merge branch 'dev' into feat/retain-interruption-message
2 parents e7c9275 + 5adaf62 commit 35264e9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/template-tauri-build-windows-x64.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,6 @@ jobs:
234234
# Upload for tauri updater
235235
aws s3 cp ./${{ steps.metadata.outputs.FILE_NAME }} s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/temp-${{ inputs.channel }}/${{ steps.metadata.outputs.FILE_NAME }}
236236
aws s3 cp ./${{ steps.metadata.outputs.FILE_NAME }}.sig s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/temp-${{ inputs.channel }}/${{ steps.metadata.outputs.FILE_NAME }}.sig
237-
238-
aws s3 cp ./src-tauri/target/release/bundle/msi/${{ steps.metadata.outputs.MSI_FILE_NAME }} s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/temp-${{ inputs.channel }}/${{ steps.metadata.outputs.MSI_FILE_NAME }}
239237
env:
240238
AWS_ACCESS_KEY_ID: ${{ secrets.DELTA_AWS_ACCESS_KEY_ID }}
241239
AWS_SECRET_ACCESS_KEY: ${{ secrets.DELTA_AWS_SECRET_ACCESS_KEY }}

src-tauri/tauri.linux.conf.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
},
77
"bundle": {
88
"targets": ["deb", "appimage"],
9-
"resources": ["resources/LICENSE"],
9+
"resources": ["resources/pre-install/**/*", "resources/LICENSE"],
10+
"externalBin": ["resources/bin/uv"],
1011
"linux": {
1112
"appimage": {
1213
"bundleMediaFramework": false,

src-tauri/tauri.macos.conf.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
},
77
"bundle": {
88
"targets": ["app", "dmg"],
9-
"resources": ["resources/LICENSE"]
9+
"resources": ["resources/pre-install/**/*", "resources/LICENSE"],
10+
"externalBin": ["resources/bin/bun", "resources/bin/uv"]
1011
}
1112
}

0 commit comments

Comments
 (0)