Skip to content

Commit

Permalink
Revert "Revert "Merge pull request #279 from jon4hz/main""
Browse files Browse the repository at this point in the history
This reverts commit 1878bed.
  • Loading branch information
jon4hz committed Feb 1, 2023
1 parent 71cf54c commit 4886537
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 6 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/release_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,15 @@ jobs:
run: |
mkdir ../../osxcross
git clone https://github.com/plentico/osxcross-target.git ../../osxcross/target
- uses: goreleaser/goreleaser-action@v2
- uses: goreleaser/goreleaser-action@v4
with:
distribution: goreleaser
version: latest
args: release --rm-dist
args: release --clean
env:
GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }}
FURY_TOKEN: ${{ secrets.FURYPUSHTOKEN }}
AUR_KEY: ${{ secrets.AUR_KEY }}
CLI_VERSION: ${{github.ref_name}}
- uses: actions/setup-python@v4
- run: pip install --upgrade cloudsmith-cli
- name: Publish to CloudSmith
Expand Down
22 changes: 20 additions & 2 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ before:
builds:
- id: darwin-build
binary: infisical
ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Env.CLI_VERSION }}
ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Version }}
flags:
- -trimpath
env:
- CGO_ENABLED=1
- CC=/home/runner/work/osxcross/target/bin/o64-clang
Expand All @@ -25,11 +27,15 @@ builds:
- goos: darwin
goarch: "386"
dir: ./cli

- id: all-other-builds
ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Env.CLI_VERSION }}
env:
- CGO_ENABLED=0
binary: infisical
ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Version }}
flags:
- -trimpath
goos:
- freebsd
- linux
Expand Down Expand Up @@ -67,8 +73,10 @@ release:

checksum:
name_template: 'checksums.txt'

snapshot:
name_template: "{{ incpatch .Version }}"
name_template: "{{ incpatch .Version }}-devel"

changelog:
sort: asc
filters:
Expand All @@ -82,6 +90,7 @@ changelog:
# - infisical
# dir: "{{ dir .ArtifactPath }}"
# cmd: curl -F package=@{{ .ArtifactName }} https://{{ .Env.FURY_TOKEN }}@push.fury.io/infisical/

brews:
- name: infisical
tap:
Expand All @@ -93,6 +102,13 @@ brews:
folder: Formula
homepage: "https://infisical.com"
description: "The official Infisical CLI"
install: |-
bin.install infisical
bash_completion.install "completions/infisical.bash" => infisical
zsh_completion.install "completions/infisical.zsh" => "_infisical"
fish_completion.install "completions/infisical.fish"
man1.install "manpages/infisical.1.gz"
nfpms:
- id: infisical
package_name: infisical
Expand All @@ -118,6 +134,7 @@ nfpms:
dst: /usr/share/zsh/site-functions/_infisical
- src: ./manpages/infisical.1.gz
dst: /usr/share/man/man1/infisical.1.gz

scoop:
bucket:
owner: Infisical
Expand All @@ -128,6 +145,7 @@ scoop:
homepage: "https://infisical.com"
description: "The official Infisical CLI"
license: MIT

aurs:
-
name: infisical-bin
Expand Down
2 changes: 1 addition & 1 deletion cli/packages/util/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ const (
)

var (
CLI_VERSION = "v0.2.11"
CLI_VERSION = "devel"
)

0 comments on commit 4886537

Please sign in to comment.