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.

Sign up for GitHub

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

Jump to bottom

chore: switch to 7.74 so we can test the release process for 7.74; also move to alpine 3.18 to get latest CVE fixes #100

Merged
merged 2 commits into from
Sep 18, 2023
Merged

chore: switch to 7.74 so we can test the release process for 7.74; also move to alpine 3.18 to get latest CVE fixes #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c726af3
switch to 7.74 so we can test the release process for 7.74; also move…
nickboldt Sep 18, 2023
85dde0f
debug merge conflicts
nickboldt Sep 18, 2023
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ We originally wrote a prototype of this tool in Rust (https://github.com/metlos/

```
$ ./configbump --help
config-bump 7.75.0-SNAPSHOT
config-bump 7.74.0-next
Usage: configbump --dir DIR --labels LABELS [--namespace NAMESPACE]

Options:
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.75.0-SNAPSHOT
7.74.0-next
2 changes: 1 addition & 1 deletion build/dockerfiles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ COPY . ./
ARG VERSION=dev
RUN GOOS=linux go build -a -ldflags '-w -s' -a -installsuffix cgo -o configbump cmd/configbump/main.go

FROM docker.io/alpine:3.12
FROM docker.io/alpine:3.18

ARG BUILD_DATE
ARG VCS_REF
Expand Down
2 changes: 1 addition & 1 deletion cmd/configbump/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type opts struct {

// Version returns the version of the program
func (opts) Version() string {
return "config-bump 7.75.0-SNAPSHOT"
return "config-bump 7.74.0-next"
}

const controllerName = "config-bump"
Expand Down
6 changes: 4 additions & 2 deletions make-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ bump_version () {
usage ()
{
echo "Usage: $0 --version [VERSION TO RELEASE] [--tag-release]"
echo "Example: $0 --version 7.75.0 --tag-release"; echo
echo "Example: $0 --version 7.74.0 --tag-release"; echo
}

if [[ ! ${VERSION} ]]; then
Expand Down Expand Up @@ -96,14 +96,16 @@ if [[ "${BASEBRANCH}" != "${BRANCH}" ]]; then
fi

set -e
set -x

# change VERSION file
echo "${VERSION}" > VERSION

# commit change into branch
if [[ ${NOCOMMIT} -eq 0 ]]; then
COMMIT_MSG="chore: release: bump to ${VERSION} in ${BRANCH}"
git commit -asm "${COMMIT_MSG}" VERSION
git status -s || true
git commit -asm "${COMMIT_MSG}" || git diff || true
git pull origin "${BRANCH}"
git push origin "${BRANCH}"
fi
Expand Down