chore(ci): fix goreleaser, labeler

TobiaszCudnik · TobiaszCudnik · commit a9d3b4b0d7d3 · 2023-09-28T13:37:35.000+02:00
Signed-off-by: Tobias Cudnik &lt;tobias@blogic.tech&gt;

ci(goreleaser): fix var names

Signed-off-by: Tobias Cudnik &lt;tobias@blogic.tech&gt;
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,2 +1,2 @@
-🗿 instill-base:
+instill base:
   - "**"
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
@@ -32,8 +32,8 @@ jobs:
           INSTILL_OAUTH_CLIENT_ID: ${{ secrets.oauth2ClientId }}
           INSTILL_OAUTH_CLIENT_SECRET: ${{ secrets.oauth2ClientSecret }}
           # config
-          INSTILL_OAUTH_ISSUER: ${{ vars.oauth2Issuer }}
-          INSTILL_OAUTH_HOSTNAME: ${{ vars.oauth2Hostname }}
-          INSTILL_OAUTH_AUDIENCE: ${{ vars.oauth2Audience }}
-          INSTILL_OAUTH_CALLBACK_HOST: ${{ vars.oauth2CallbackHost }}
-          INSTILL_OAUTH_CALLBACK_PORT: ${{ vars.oauth2CallbackPort }}
+          INSTILL_OAUTH_ISSUER: ${{ vars.INSTILL_OAUTH_ISSUER }}
+          INSTILL_OAUTH_HOSTNAME: ${{ vars.INSTILL_OAUTH_HOSTNAME }}
+          INSTILL_OAUTH_AUDIENCE: ${{ vars.INSTILL_OAUTH_AUDIENCE }}
+          INSTILL_OAUTH_CALLBACK_HOST: ${{ vars.INSTILL_OAUTH_CALLBACK_HOST }}
+          INSTILL_OAUTH_CALLBACK_PORT: ${{ vars.INSTILL_OAUTH_CALLBACK_PORT }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -46,23 +46,19 @@ builds:
     goarch: [amd64]
 
 archives:
-  - id: nix
-    builds: [macos, linux]
-    <<: &archive_defaults
-      name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
-    wrap_in_directory: true
-    replacements:
-      darwin: macOS
-    format: tar.gz
-    files:
-      - LICENSE
-  - id: windows
-    builds: [windows]
-    <<: *archive_defaults
-    wrap_in_directory: false
-    format: zip
-    files:
-      - LICENSE
+  - format: tar.gz
+    # this name template makes the OS and Arch compatible with the results of uname.
+    name_template: >-
+      {{ .ProjectName }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end }}
+    # use zip for windows archives
+    format_overrides:
+      - goos: windows
+        format: zip
 
 checksum:
   name_template: 'checksums_v{{ .Version }}_sha256.txt'

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-🗿 instill-base:`
	`1`	`+instill base:`
`2`	`2`	`- "**"`