fix: ci

ft-t · Jan 3, 2025 · d2f4141 · d2f4141
1 parent ff1853a
commit d2f4141
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -33,6 +33,14 @@ jobs:
       - uses: actions/checkout@v4
       - run: make build
 
+      - name: Create deb package
+        run: cd ci && bash ./deb.sh
+
+      - uses: montudor/action-zip@v1
+        with:
+          args: zip -qq -r browser-switcher-${{ env.SEM_VERSION }}-windows-amd64.zip .
+          working-directory: dist/win/
+
       - name: release
         uses: actions/create-release@v1
         id: create_release
@@ -44,29 +52,22 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
-      - uses: montudor/action-zip@v1
-        with:
-          args: zip -qq -r browser-switcher-${{ env.SEM_VERSION }}-windows-amd64.zip .
-          working-directory: dist/win/
-
-      - run: cd ci && bash ./deb.sh
-
-      - name: upload windows artifact
+      - name: upload linux artifact
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: browser-switcher-${{ env.SEM_VERSION }}-windows-amd64.zip
-          asset_name: browser-switcher-${{ env.SEM_VERSION }}-windows-amd64.zip
+          asset_path: ci/browser-switcher_${{ env.RAW_VERSION }}.deb
+          asset_name: browser-switcher_${{ env.RAW_VERSION }}.deb
           asset_content_type: application/octet-stream
 
-      - name: upload linux artifact
+      - name: upload windows artifact
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ci/browser-switcher_${{ env.RAW_VERSION }}.deb
-          asset_name: browser-switcher_${{ env.RAW_VERSION }}.deb
+          asset_path: browser-switcher-${{ env.SEM_VERSION }}-windows-amd64.zip
+          asset_name: browser-switcher-${{ env.SEM_VERSION }}-windows-amd64.zip
           asset_content_type: application/octet-stream
diff --git a/Makefile b/Makefile
@@ -15,8 +15,6 @@ build-linux:
 	@mkdir -p dist/linux
 	@GOOS=linux go build -buildvcs=false -o dist/linux/browser-switcher-proxied cmd/switcher/main.go
 	@GOOS=linux go build -buildvcs=false -o dist/linux/browser-switcher cmd/proxy/main.go cmd/proxy/linux.go
-	@cp -f scripts/register.sh dist/linux/
-	@cp -f scripts/browser-switcher.desktop dist/linux
 
 .PHONY: debug-linux
 debug-linux: build-linux

diff --git a/pkg/launcher/windows.go b/pkg/launcher/windows.go
@@ -2,6 +2,14 @@
 
 package launcher
 
+import (
+	"context"
+	"os/exec"
+	"slices"
+
+	"github.com/ft-t/browser-switcher/pkg/config"
+)
+
 func (l *Launcher) Launch(_ context.Context, browser *config.Browser) error {
 	return exec.Command(
 		browser.BinaryPath,