Skip to content

Commit a1dfea8

Browse files
committed
build: remove msi package
1 parent adf3aaa commit a1dfea8

File tree

2 files changed

+5
-41
lines changed

2 files changed

+5
-41
lines changed

.github/workflows/package.yml

+1-37
Original file line numberDiff line numberDiff line change
@@ -287,54 +287,18 @@ jobs:
287287
- name: Code Format
288288
run: pnpm prettier --write .
289289
- name: Build and Package
290-
if: matrix.target == 'aarch64-pc-windows-msvc'
291290
run: |
292291
$env:TAURI_PRIVATE_KEY="${{ secrets.TAURI_PRIVATE_KEY }}"
293292
$env:TAURI_KEY_PASSWORD="${{ secrets.TAURI_KEY_PASSWORD }}"
294293
pnpm tauri build -b nsis,updater --target ${{ matrix.target }}
295-
- name: Build and Package
296-
if: matrix.target == 'x86_64-pc-windows-msvc' || matrix.target == 'i686-pc-windows-msvc'
297-
run: |
298-
$env:TAURI_PRIVATE_KEY="${{ secrets.TAURI_PRIVATE_KEY }}"
299-
$env:TAURI_KEY_PASSWORD="${{ secrets.TAURI_KEY_PASSWORD }}"
300-
pnpm tauri build --target ${{ matrix.target }}
301-
- name: Upload Artifacts
302-
if: matrix.target == 'x86_64-pc-windows-msvc' || matrix.target == 'i686-pc-windows-msvc'
303-
uses: actions/upload-artifact@v3
304-
with:
305-
name: pot_${{ matrix.target }}.msi
306-
path: src-tauri/target/${{ matrix.target }}/release/bundle/msi/*.msi
307-
if-no-files-found: error
308294
- name: Upload Artifacts
309-
if: matrix.target == 'x86_64-pc-windows-msvc' || matrix.target == 'i686-pc-windows-msvc'
310-
uses: actions/upload-artifact@v3
311-
with:
312-
name: pot_${{ matrix.target }}.exe
313-
path: src-tauri/target/${{ matrix.target }}/release/bundle/nsis/*.exe
314-
if-no-files-found: error
315-
- name: Upload Artifacts
316-
if: matrix.target == 'aarch64-pc-windows-msvc'
317295
uses: actions/upload-artifact@v3
318296
with:
319297
name: pot_${{ matrix.target }}.exe
320298
path: src-tauri/target/${{ matrix.target }}/release/bundle/nsis/*.exe
321299
if-no-files-found: error
322300
- name: Upload Release
323-
if: startsWith(github.ref, 'refs/tags') && (matrix.target == 'x86_64-pc-windows-msvc' || matrix.target == 'i686-pc-windows-msvc')
324-
uses: softprops/action-gh-release@v1
325-
with:
326-
body_path: CHANGELOG
327-
token: ${{ secrets.TOKEN }}
328-
files: src-tauri/target/${{ matrix.target }}/release/bundle/msi/*.msi*
329-
- name: Upload Release
330-
if: startsWith(github.ref, 'refs/tags') && (matrix.target == 'x86_64-pc-windows-msvc' || matrix.target == 'i686-pc-windows-msvc')
331-
uses: softprops/action-gh-release@v1
332-
with:
333-
body_path: CHANGELOG
334-
token: ${{ secrets.TOKEN }}
335-
files: src-tauri/target/${{ matrix.target }}/release/bundle/nsis/*setup*
336-
- name: Upload Release
337-
if: startsWith(github.ref, 'refs/tags') && matrix.target == 'aarch64-pc-windows-msvc'
301+
if: startsWith(github.ref, 'refs/tags')
338302
uses: softprops/action-gh-release@v1
339303
with:
340304
body_path: CHANGELOG

src-tauri/src/window.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ pub fn build_screenshot_window(handle: &AppHandle, label: &str) -> Result<Window
170170
let dpi = current_monitor.scale_factor();
171171
let physical_position = current_monitor.position();
172172
let position: tauri::LogicalPosition<f64> = physical_position.to_logical(dpi);
173-
#[cfg(target_os="macos")]
174-
let size =current_monitor.size();
173+
#[cfg(target_os = "macos")]
174+
let size = current_monitor.size();
175175
let window =
176176
tauri::WindowBuilder::new(handle, label, tauri::WindowUrl::App("index.html".into()))
177177
.position(position.x, position.y)
@@ -182,9 +182,9 @@ pub fn build_screenshot_window(handle: &AppHandle, label: &str) -> Result<Window
182182
.visible(false)
183183
.build()
184184
.unwrap();
185-
#[cfg(target_os="macos")]
185+
#[cfg(target_os = "macos")]
186186
window.set_size(*size).unwrap();
187-
#[cfg(not(target_os="macos"))]
187+
#[cfg(not(target_os = "macos"))]
188188
window.set_fullscreen(true).unwrap();
189189
window.set_always_on_top(true).unwrap();
190190
Ok(window)

0 commit comments

Comments
 (0)