Revert "Revert "Merge pull request #279 from jon4hz/main""

This reverts commit 1878bed10a.
This commit is contained in:
jon4hz
2023-02-01 14:19:49 +01:00
parent 71cf54c28b
commit 4886537a56
3 changed files with 23 additions and 6 deletions
+2 -3
View File
@@ -34,16 +34,15 @@ jobs:
run: | run: |
mkdir ../../osxcross mkdir ../../osxcross
git clone https://github.com/plentico/osxcross-target.git ../../osxcross/target git clone https://github.com/plentico/osxcross-target.git ../../osxcross/target
- uses: goreleaser/goreleaser-action@v2 - uses: goreleaser/goreleaser-action@v4
with: with:
distribution: goreleaser distribution: goreleaser
version: latest version: latest
args: release --rm-dist args: release --clean
env: env:
GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }}
FURY_TOKEN: ${{ secrets.FURYPUSHTOKEN }} FURY_TOKEN: ${{ secrets.FURYPUSHTOKEN }}
AUR_KEY: ${{ secrets.AUR_KEY }} AUR_KEY: ${{ secrets.AUR_KEY }}
CLI_VERSION: ${{github.ref_name}}
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
- run: pip install --upgrade cloudsmith-cli - run: pip install --upgrade cloudsmith-cli
- name: Publish to CloudSmith - name: Publish to CloudSmith
+20 -2
View File
@@ -14,7 +14,9 @@ before:
builds: builds:
- id: darwin-build - id: darwin-build
binary: infisical 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: env:
- CGO_ENABLED=1 - CGO_ENABLED=1
- CC=/home/runner/work/osxcross/target/bin/o64-clang - CC=/home/runner/work/osxcross/target/bin/o64-clang
@@ -25,11 +27,15 @@ builds:
- goos: darwin - goos: darwin
goarch: "386" goarch: "386"
dir: ./cli dir: ./cli
- id: all-other-builds - id: all-other-builds
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={{ .Env.CLI_VERSION }}
env: env:
- CGO_ENABLED=0 - CGO_ENABLED=0
binary: infisical binary: infisical
ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Version }}
flags:
- -trimpath
goos: goos:
- freebsd - freebsd
- linux - linux
@@ -67,8 +73,10 @@ release:
checksum: checksum:
name_template: 'checksums.txt' name_template: 'checksums.txt'
snapshot: snapshot:
name_template: "{{ incpatch .Version }}" name_template: "{{ incpatch .Version }}-devel"
changelog: changelog:
sort: asc sort: asc
filters: filters:
@@ -82,6 +90,7 @@ changelog:
# - infisical # - infisical
# dir: "{{ dir .ArtifactPath }}" # dir: "{{ dir .ArtifactPath }}"
# cmd: curl -F package=@{{ .ArtifactName }} https://{{ .Env.FURY_TOKEN }}@push.fury.io/infisical/ # cmd: curl -F package=@{{ .ArtifactName }} https://{{ .Env.FURY_TOKEN }}@push.fury.io/infisical/
brews: brews:
- name: infisical - name: infisical
tap: tap:
@@ -93,6 +102,13 @@ brews:
folder: Formula folder: Formula
homepage: "https://infisical.com" homepage: "https://infisical.com"
description: "The official Infisical CLI" 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: nfpms:
- id: infisical - id: infisical
package_name: infisical package_name: infisical
@@ -118,6 +134,7 @@ nfpms:
dst: /usr/share/zsh/site-functions/_infisical dst: /usr/share/zsh/site-functions/_infisical
- src: ./manpages/infisical.1.gz - src: ./manpages/infisical.1.gz
dst: /usr/share/man/man1/infisical.1.gz dst: /usr/share/man/man1/infisical.1.gz
scoop: scoop:
bucket: bucket:
owner: Infisical owner: Infisical
@@ -128,6 +145,7 @@ scoop:
homepage: "https://infisical.com" homepage: "https://infisical.com"
description: "The official Infisical CLI" description: "The official Infisical CLI"
license: MIT license: MIT
aurs: aurs:
- -
name: infisical-bin name: infisical-bin
+1 -1
View File
@@ -14,5 +14,5 @@ const (
) )
var ( var (
CLI_VERSION = "v0.2.11" CLI_VERSION = "devel"
) )