Merge branch 'master' into hs/scep

smallstep · Mar 21, 2021 · a526065 · a526065
2 parents a4844fe + 3b9eed0
commit a526065
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 46 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,15 +29,6 @@ jobs:
         name: Lint, Test, Build
         id: lint_test_build
         run: V=1 make -j1 bootstrap ci
-      -
-        name: Is Pre-release
-        id: is_prerelease
-        run: |
-          set +e
-          echo ${{ github.ref }} | grep "\-rc.*"
-          OUT=$?
-          if [ $OUT -eq 0 ]; then IS_PRERELEASE=true; else IS_PRERELEASE=false; fi
-          echo "::set-output name=IS_PRERELEASE::${IS_PRERELEASE}"
 
   create_release:
     name: Create Release

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -13,13 +13,17 @@ builds:
     goos:
       - linux
       - darwin
+      - windows
     goarch:
       - amd64
       - arm
       - arm64
       - 386
     goarm:
       - 7
+    ignore:
+     - goos: windows
+       goarch: 386
     flags:
       - -trimpath
     main: ./cmd/step-ca/main.go
@@ -33,13 +37,17 @@ builds:
     goos:
       - linux
       - darwin
+      - windows
     goarch:
       - amd64
       - arm
       - arm64
       - 386
     goarm:
       - 7
+    ignore:
+     - goos: windows
+       goarch: 386
     flags:
       - -trimpath
     main: ./cmd/step-cloudkms-init/main.go
@@ -53,13 +61,17 @@ builds:
     goos:
       - linux
       - darwin
+      - windows
     goarch:
       - amd64
       - arm
       - arm64
       - 386
     goarm:
       - 7
+    ignore:
+     - goos: windows
+       goarch: 386
     flags:
       - -trimpath
     main: ./cmd/step-awskms-init/main.go
@@ -99,13 +111,13 @@ release:
 
   # If set to true, will not auto-publish the release.
   # Default is false.
-  draft: true
+  draft: false
 
   # If set to auto, will mark the release as not ready for production
   # in case there is an indicator for this in the tag e.g. v1.0.0-rc1
   # If set to true, will mark the release as not ready for production.
   # Default is false.
-  prerelease: false
+  prerelease: auto
 
   # You can change the name of the release.
   # Default is `{{.Tag}}`
@@ -124,41 +136,41 @@ release:
   #  - glob: ./glob/**/to/**/file/**/*
   #  - glob: ./glob/foo/to/bar/file/foobar/override_from_previous
 
-  #scoop:
-  #  # Template for the url which is determined by the given Token (github or gitlab)
-  #  # Default for github is "https://github.com/<repo_owner>/<repo_name>/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
-  #  # Default for gitlab is "https://gitlab.com/<repo_owner>/<repo_name>/uploads/{{ .ArtifactUploadHash }}/{{ .ArtifactName }}"
-  #  # Default for gitea is "https://gitea.com/<repo_owner>/<repo_name>/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
-  #  url_template: "http://github.com/smallstep/certificates/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
-  #
-  #  # Repository to push the app manifest to.
-  #  bucket:
-  #    owner: smallstep
-  #    name: scoop-bucket
-  #
-  #  # Git author used to commit to the repository.
-  #  # Defaults are shown.
-  #  commit_author:
-  #    name: goreleaserbot
-  #    email: goreleaser@smallstep.com
-  #
-  #  # The project name and current git tag are used in the format string.
-  #  commit_msg_template: "Scoop update for {{ .ProjectName }} version {{ .Tag }}"
-  #
-  #  # Your app's homepage.
-  #  # Default is empty.
-  #  homepage: "https://smallstep.com/docs/step-ca"
-  #
-  #  # Skip uploads for prerelease.
-  #  skip_upload: auto
-  #
-  #  # Your app's description.
-  #  # Default is empty.
-  #  description: "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH."
-  #
-  #  # Your app's license
-  #  # Default is empty.
-  #  license: "Apache-2.0"
+scoop:
+  # Template for the url which is determined by the given Token (github or gitlab)
+  # Default for github is "https://github.com/<repo_owner>/<repo_name>/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
+  # Default for gitlab is "https://gitlab.com/<repo_owner>/<repo_name>/uploads/{{ .ArtifactUploadHash }}/{{ .ArtifactName }}"
+  # Default for gitea is "https://gitea.com/<repo_owner>/<repo_name>/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
+  url_template: "http://github.com/smallstep/certificates/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
+
+  # Repository to push the app manifest to.
+  bucket:
+    owner: smallstep
+    name: scoop-bucket
+
+  # Git author used to commit to the repository.
+  # Defaults are shown.
+  commit_author:
+    name: goreleaserbot
+    email: goreleaser@smallstep.com
+
+  # The project name and current git tag are used in the format string.
+  commit_msg_template: "Scoop update for {{ .ProjectName }} version {{ .Tag }}"
+
+  # Your app's homepage.
+  # Default is empty.
+  homepage: "https://smallstep.com/docs/step-ca"
+
+  # Skip uploads for prerelease.
+  skip_upload: auto
+
+  # Your app's description.
+  # Default is empty.
+  description: "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH."
+
+  # Your app's license
+  # Default is empty.
+  license: "Apache-2.0"
 
   #dockers:
   #  - dockerfile: docker/Dockerfile