fix for Go CI

DefangLabs · Jul 2, 2024 · 198eec5 · 198eec5
1 parent 4c4f5aa
commit 198eec5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -119,6 +119,7 @@ jobs:
 
   build-and-sign:
     name: Build app and sign files with Trusted Signing
+    environment: release
     needs: go-test
     runs-on: windows-latest # for signtool
     env: # from https://github.com/spiffe/spire/pull/5158
@@ -244,13 +245,13 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: dist-mac
-          path: src/dist
+          path: src/distx
 
       - name: Download dist-win folder
         uses: actions/download-artifact@v4
         with:
           name: dist-win
-          path: src/dist
+          path: src/distx
 
       - name: List files
         run: ls -lR src/dist

diff --git a/src/.goreleaser-prebuilt.yml b/src/.goreleaser-prebuilt.yml
@@ -13,7 +13,7 @@ builds:
     goamd64:
       - v1
     prebuilt:
-      path: dist-{{ .Os }}/defang_{{ .Os }}_{{ .Arch }}{{ with .Amd64 }}_{{ . }}{{ end }}/defang{{ .Ext }}
+      path: distx/defang-{{ if eq .Os "darwin" }}mac{{ else }}cli{{ end }}_{{ .Os }}_{{ .Arch }}{{ with .Amd64 }}_{{ . }}{{ end }}/defang{{ .Ext }}
     binary: defang
 
 source:
@@ -27,9 +27,9 @@ archives:
         format: zip
     # replace "darwin" with "macOS" in the filename; replace "all" with ""; NOTE: if you change this, also change go.yml GitHub Actions workflow
     name_template: '{{ .ProjectName }}_{{ .Version }}_{{ if eq .Os "darwin" }}macOS{{ else }}{{ .Os }}{{ end }}{{ if ne .Arch "all" }}_{{ .Arch }}{{ end }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
-    hooks:
-      after:
-        - '{{ if eq .Os "darwin" }}./bin/notarize.sh "{{ .Path }}"{{ else }}true{{ end }}'
+    # hooks:
+    #   after:
+    #     - '{{ if eq .Os "darwin" }}./bin/notarize.sh "{{ .Path }}"{{ else }}true{{ end }}'
 
 release:
   github:
@@ -89,13 +89,13 @@ winget:
       owner: DefangLabs
       name: winget-pkgs
       branch: "Defang-{{.Version}}"
-      pull_request:
-        enabled: true
-        draft: true
-        base:
-          owner: microsoft
-          name: winget-pkgs
-          branch: master
+      # pull_request:
+      #   enabled: true
+      #   draft: true
+      #   base:
+      #     owner: microsoft
+      #     name: winget-pkgs
+      #     branch: master
 
 announce:
   discord: