fix resouse.go

mpkondrashin · Mar 3, 2024 · db6e38d · db6e38d
1 parent debc951
commit db6e38d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
@@ -45,6 +45,9 @@ jobs:
             setup_windows_amd64.zip
   Build-Release-Darwin-amd64:
     runs-on: macos-13
+    env:
+      GOPRIVATE: github.com/mpkondrashin/ddan
+      DDAN_FOR_SANDBOXER: ${{ secrets.DDAN_FOR_SANDBOXER }}
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
@@ -59,6 +62,9 @@ jobs:
         with:
           go-version: 1.21.5
 
+      - name: Config git
+        run: git config --global url.https://$DDAN_FOR_SANDBOXER@github.com/.insteadOf https://github.com/
+
       - name: Install Fyne
         run: go install fyne.io/fyne/v2/cmd/fyne@latest
 
@@ -76,7 +82,7 @@ jobs:
             setup_darwin_amd64.zip
   
   Build-Release-Darwin-arm64:
-    runs-on: flyci-macos-large-latest-m2 #macos-13-xlarge
+    runs-on: macos-13-xlarge #flyci-macos-large-latest-m2 #macos-13-xlarge
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4

diff --git a/Makefile_darwin b/Makefile_darwin
@@ -29,9 +29,12 @@ setup_$(GOOS)_$(GOARCH).zip: SandboxerInstall.app/Contents/MacOS/install
 #Sandboxer.dmg: output/SandboxerInstall.app/Contents/MacOS/install
 #	hdiutil create -volname "Sandboxer" -srcfolder "output" -ov -format UDZO "Sandboxer.dmg"
 
-SandboxerInstall.app/Contents/MacOS/install: $(wildcard cmd/install/*.go) $(wildcard pkg/*/*.go) pkg/globals/version.go cmd/sandboxer/icon.go  resources/icon.png cmd/install/embed/sandboxer.tar.gz cmd/install/embed/sandboxer_submit.tar.gz
+SandboxerInstall.app/Contents/MacOS/install: $(wildcard cmd/install/*.go) $(wildcard pkg/*/*.go) pkg/globals/version.go  cmd/install/resource.go cmd/install/embed/sandboxer.tar.gz cmd/install/embed/sandboxer_submit.tar.gz
 	fyne package --os darwin --name SandboxerInstall --appID in.kondrash.sandboxer --appVersion $(VERSION) --appBuild $(BUILD) --icon ../../resources/icon.png --release --sourceDir ./cmd/install
 
+cmd/install/resource.go: resources/icon_transparent.png 
+	fyne bundle --name ApplicationIcon --package main --output cmd/install/resource.go resources/icon_transparent.png 
+
 cmd/install/embed/sandboxer_submit.tar.gz: resources/sandboxer_submit.tar.gz
 	cp resources/sandboxer_submit.tar.gz cmd/install/embed/sandboxer_submit.tar.gz