Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multi-platform cleanup #58

Merged
merged 6 commits into from
May 18, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
master->main
onyxraven committed May 15, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 8232353827355e02b36886e69650b15c733da1dd
2 changes: 1 addition & 1 deletion cmd/completion.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright © 2017 Ibotta
// https://github.com/spf13/cobra/blob/master/bash_completions.md.
// https://github.com/spf13/cobra/blob/main/bash_completions.md.

package cmd

2 changes: 1 addition & 1 deletion cmd/docs.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright © 2017 Ibotta
// https://github.com/spf13/cobra/blob/master/doc/md_docs.md
// https://github.com/spf13/cobra/blob/main/doc/md_docs.md

package cmd

4 changes: 2 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
@@ -61,10 +61,10 @@ execute() {
fi

if [ -n "${FORCE}" ] || ! is_command sops; then
http_exec https://raw.githubusercontent.com/Ibotta/sopstool/master/sopsinstall.sh -b "${BINDIR}" "$@" "${SOPS_VERSION}"
http_exec https://raw.githubusercontent.com/Ibotta/sopstool/main/sopsinstall.sh -b "${BINDIR}" "$@" "${SOPS_VERSION}"
fi

http_exec https://raw.githubusercontent.com/Ibotta/sopstool/master/sopstoolinstall.sh -b "${BINDIR}" "$@" "${SOPSTOOL_VERSION}"
http_exec https://raw.githubusercontent.com/Ibotta/sopstool/main/sopstoolinstall.sh -b "${BINDIR}" "$@" "${SOPSTOOL_VERSION}"

echo "Both sops and sopstool installed"
}
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ import "github.com/Ibotta/sopstool/cmd"

// Goreleaser default is `-s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}`.
var (
version = "master"
version = "main"
commit = "dirty"
date = "Now"
)
1 change: 0 additions & 1 deletion scripts/deploy-docker
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@ REGEX="^v([0-9]+)\.([0-9]+)\.([0-9]+)"
export VERSION=$(jq -r '.version' dist/metadata.json)
export TAG=$(jq -r '.tag' dist/metadata.json)
if [[ "${TAG}" =~ ${REGEX} ]]; then
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gets the version information from the goreleaser metadata output

export RAWVERSION=${BASH_REMATCH[0]}
export MAJOR=${BASH_REMATCH[1]}
export MINOR=${BASH_REMATCH[2]}
export PATCH=${BASH_REMATCH[3]}