diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index af395ce6c..f728d52bd 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -4,7 +4,7 @@ on: push: # run only against tags tags: - - "v*" + - "infisical-cli/v*.*.*" permissions: contents: write @@ -41,13 +41,14 @@ jobs: git clone https://github.com/plentico/osxcross-target.git ../../osxcross/target - uses: goreleaser/goreleaser-action@v4 with: - distribution: goreleaser + distribution: goreleaser-pro version: latest args: release --clean env: GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }} FURY_TOKEN: ${{ secrets.FURYPUSHTOKEN }} AUR_KEY: ${{ secrets.AUR_KEY }} + GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} - uses: actions/setup-python@v4 - run: pip install --upgrade cloudsmith-cli - name: Publish to CloudSmith diff --git a/.goreleaser.yaml b/.goreleaser.yaml index dfcacf59d..2d4bdea5b 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -11,6 +11,10 @@ before: - ./cli/scripts/completions.sh - ./cli/scripts/manpages.sh +monorepo: + tag_prefix: infisical-cli/ + dir: cli + builds: - id: darwin-build binary: infisical @@ -74,14 +78,7 @@ checksum: name_template: "checksums.txt" snapshot: - name_template: "{{ incpatch .Version }}-devel" - -changelog: - sort: asc - filters: - exclude: - - "^docs:" - - "^test:" + name_template: "{{ .Version }}-devel" # publishers: # - name: fury.io @@ -101,12 +98,12 @@ 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" + # 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 @@ -124,15 +121,15 @@ nfpms: - apk - archlinux bindir: /usr/bin - contents: - - src: ./completions/infisical.bash - dst: /etc/bash_completion.d/infisical - - src: ./completions/infisical.fish - dst: /usr/share/fish/vendor_completions.d/infisical.fish - - src: ./completions/infisical.zsh - dst: /usr/share/zsh/site-functions/_infisical - - src: ./manpages/infisical.1.gz - dst: /usr/share/man/man1/infisical.1.gz + # contents: + # - src: ./completions/infisical.bash + # dst: /etc/bash_completion.d/infisical + # - src: ./completions/infisical.fish + # dst: /usr/share/fish/vendor_completions.d/infisical.fish + # - src: ./completions/infisical.zsh + # dst: /usr/share/zsh/site-functions/_infisical + # - src: ./manpages/infisical.1.gz + # dst: /usr/share/man/man1/infisical.1.gz scoop: bucket: @@ -159,15 +156,6 @@ aurs: install -Dm755 "./infisical" "${pkgdir}/usr/bin/infisical" # license install -Dm644 "./LICENSE" "${pkgdir}/usr/share/licenses/infisical/LICENSE" - # completions - mkdir -p "${pkgdir}/usr/share/bash-completion/completions/" - mkdir -p "${pkgdir}/usr/share/zsh/site-functions/" - mkdir -p "${pkgdir}/usr/share/fish/vendor_completions.d/" - install -Dm644 "./completions/infisical.bash" "${pkgdir}/usr/share/bash-completion/completions/infisical" - install -Dm644 "./completions/infisical.zsh" "${pkgdir}/usr/share/zsh/site-functions/infisical" - install -Dm644 "./completions/infisical.fish" "${pkgdir}/usr/share/fish/vendor_completions.d/infisical.fish" - # man pages - install -Dm644 "./manpages/infisical.1.gz" "${pkgdir}/usr/share/man/man1/infisical.1.gz" # dockers: # - dockerfile: cli/docker/Dockerfile diff --git a/README.md b/README.md index 1766f7d33..a19f1df90 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ And much more. ## Getting started -| Check out the [Quickstarts](https://infisical.com/docs/documentation/getting-started/introduction) Guide +Check out the [Quickstart](https://infisical.com/docs/getting-started/introduction) Guides ### Use Infisical Cloud diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 4c6bed800..5dce2bc09 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -5,7 +5,7 @@ const client = new InfisicalClient({ }); export const getPort = async () => (await client.getSecret('PORT')).secretValue || 4000; -export const getInviteOnlySignup = async () => (await client.getSecret('INVITE_ONLY_SIGNUP')).secretValue == undefined ? false : await client.getSecret('INVITE_ONLY_SIGNUP'); +export const getInviteOnlySignup = async () => (await client.getSecret('INVITE_ONLY_SIGNUP')).secretValue == undefined ? false : (await client.getSecret('INVITE_ONLY_SIGNUP')).secretValue; export const getEncryptionKey = async () => (await client.getSecret('ENCRYPTION_KEY')).secretValue; export const getSaltRounds = async () => parseInt((await client.getSecret('SALT_ROUNDS')).secretValue) || 10; export const getJwtAuthLifetime = async () => (await client.getSecret('JWT_AUTH_LIFETIME')).secretValue || '10d'; diff --git a/cli/packages/util/check-for-update.go b/cli/packages/util/check-for-update.go index 2f283070c..53eb6dfb7 100644 --- a/cli/packages/util/check-for-update.go +++ b/cli/packages/util/check-for-update.go @@ -4,12 +4,14 @@ import ( "encoding/json" "errors" "fmt" - log "github.com/sirupsen/logrus" "io" "net/http" "os" "os/exec" "runtime" + "strings" + + log "github.com/sirupsen/logrus" "github.com/fatih/color" ) @@ -73,7 +75,23 @@ func getLatestTag(repoOwner string, repoName string) (string, error) { return "", fmt.Errorf("failed to unmarshal github response: %w", err) } - return tags[0].Name[1:], nil + // Filter tags with prefix "infisical-cli/" + prefix := "infisical-cli/v" + var validTags []string + for _, tag := range tags { + if strings.HasPrefix(tag.Name, prefix) { + validTags = append(validTags, tag.Name) + } + } + + if len(validTags) == 0 { + return "", errors.New("no tags for the CLI is found") + } + + // Extract the version from the first valid tag + version := strings.TrimPrefix(validTags[0], prefix) + + return version, nil } func GetUpdateInstructions() string {