Skip to content

Commit e7c4f69

Browse files
chore(deps): Bump github.com/obalunenko/version from 1.2.0 to 1.3.0 (#148)
* chore(deps): Bump github.com/obalunenko/version from 1.2.0 to 1.3.0 Bumps [github.com/obalunenko/version](https://github.com/obalunenko/version) from 1.2.0 to 1.3.0. - [Release notes](https://github.com/obalunenko/version/releases) - [Commits](obalunenko/version@v1.2.0...v1.3.0) --- updated-dependencies: - dependency-name: github.com/obalunenko/version dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * chore: Migrate to go 1.24 * chore: Bump go-tools to v1.7.0 * fix: goreleaser config --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Oleg Balunenko <[email protected]>
1 parent 93b4d3e commit e7c4f69

File tree

12 files changed

+97
-107
lines changed

12 files changed

+97
-107
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
3535
# Learn more about CodeQL language support at https://git.io/codeql-language-support
3636
language: [ 'go' ]
37-
os: [ 'ubuntu-22.04' ]
38-
go-version: [1.23.x]
37+
os: [ 'ubuntu-24.04' ]
38+
go-version: [1.24.x]
3939
steps:
4040
- name: Checkout
4141
uses: actions/checkout@v4

.github/workflows/dockerfiles.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
[
2525
"./build/docker/go-tools/Dockerfile",
2626
]
27-
runs-on: "ubuntu-22.04"
27+
runs-on: "ubuntu-24.04"
2828
name: Lint ${{ matrix.dockerfile }}
2929
steps:
3030
- name: Checkout

.github/workflows/go.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242
fail-fast: false
4343
max-parallel: 3
4444
matrix:
45-
os: [ 'ubuntu-22.04' ]
46-
go-version: [1.23.x]
45+
os: [ 'ubuntu-24.04' ]
46+
go-version: [1.24.x]
4747
runs-on: ${{ matrix.os }}
4848
name: Build
4949
steps:
@@ -89,8 +89,8 @@ jobs:
8989
fail-fast: false
9090
max-parallel: 2
9191
matrix:
92-
os: [ 'ubuntu-22.04' ]
93-
go-version: [1.23.x]
92+
os: [ 'ubuntu-24.04' ]
93+
go-version: [1.24.x]
9494
runs-on: ${{ matrix.os }}
9595
name: Run Tests
9696
steps:
@@ -136,8 +136,8 @@ jobs:
136136
fail-fast: false
137137
max-parallel: 2
138138
matrix:
139-
os: [ 'ubuntu-22.04' ]
140-
go-version: [1.23.x]
139+
os: [ 'ubuntu-24.04' ]
140+
go-version: [1.24.x]
141141
runs-on: ${{ matrix.os }}
142142
name: Run linters
143143
steps:
@@ -188,8 +188,8 @@ jobs:
188188
fail-fast: true
189189
max-parallel: 1
190190
matrix:
191-
os: [ 'ubuntu-22.04' ]
192-
go-version: [1.23.x]
191+
os: [ 'ubuntu-24.04' ]
192+
go-version: [1.24.x]
193193
runs-on: ${{ matrix.os }}
194194
name: Quality reports
195195
steps:

.github/workflows/release.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
fail-fast: false
1414
max-parallel: 2
1515
matrix:
16-
os: [ 'ubuntu-22.04' ]
17-
go-version: [1.23.x]
16+
os: [ 'ubuntu-24.04' ]
17+
go-version: [1.24.x]
1818
runs-on: ${{ matrix.os }}
1919
name: Build
2020
steps:
@@ -59,8 +59,8 @@ jobs:
5959
fail-fast: false
6060
max-parallel: 2
6161
matrix:
62-
os: [ 'ubuntu-22.04' ]
63-
go-version: [1.23.x]
62+
os: [ 'ubuntu-24.04' ]
63+
go-version: [1.24.x]
6464
runs-on: ${{ matrix.os }}
6565
name: Regression tests
6666
steps:
@@ -108,8 +108,8 @@ jobs:
108108
fail-fast: false
109109
max-parallel: 1
110110
matrix:
111-
os: [ 'ubuntu-22.04' ]
112-
go-version: [1.23.x]
111+
os: [ 'ubuntu-24.04' ]
112+
go-version: [1.24.x]
113113
runs-on: ${{ matrix.os }}
114114
name: Lint
115115
steps:
@@ -161,8 +161,8 @@ jobs:
161161
fail-fast: false
162162
max-parallel: 1
163163
matrix:
164-
os: [ 'ubuntu-22.04' ]
165-
go-version: [1.23.x]
164+
os: [ 'ubuntu-24.04' ]
165+
go-version: [1.24.x]
166166
runs-on: ${{ matrix.os }}
167167
name: Release
168168
steps:

.goreleaser.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ builds:
4242
main: ./cmd/ge-tax-calc
4343
flags:
4444
- -trimpath
45-
ldflags:
46-
- "{{ .Env.GO_BUILD_LDFLAGS }}"
47-
-
45+
4846
universal_binaries:
4947
- # ID of the source build
5048
#
@@ -68,11 +66,13 @@ archives:
6866
- id: cli
6967
builds:
7068
- cli
71-
format: tar.gz
69+
formats:
70+
- tar.gz
7271
wrap_in_directory: true
7372
format_overrides:
7473
- goos: windows
75-
format: zip
74+
formats:
75+
- zip
7676
name_template: "{{ .Binary }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
7777
files:
7878
- LICENSE

build/docker/go-tools/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM ghcr.io/obalunenko/go-tools:v1.6.12 AS builder
1+
FROM ghcr.io/obalunenko/go-tools:v1.7.0 AS builder
22

33
CMD ["/bin/sh", "-c", ""]

go.mod

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
module github.com/obalunenko/georgia-tax-calculator
22

3-
go 1.23
3+
go 1.24
4+
5+
toolchain go1.24.0
46

57
require (
68
github.com/AlecAivazis/survey/v2 v2.3.7
79
github.com/briandowns/spinner v1.23.2
810
github.com/obalunenko/getenv v1.14.0
911
github.com/obalunenko/logger v1.2.0
10-
github.com/obalunenko/version v1.2.0
12+
github.com/obalunenko/version v1.3.0
1113
github.com/savioxavier/termlink v1.4.2
1214
github.com/shopspring/decimal v1.4.0
1315
github.com/stretchr/testify v1.10.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ github.com/obalunenko/getenv v1.14.0 h1:Q8ClxnNMr5a6N0xNg7nHbdhZI4UUfhZMCjabGruq
3333
github.com/obalunenko/getenv v1.14.0/go.mod h1:PsuPvyLaE71FF7ikdCvPGqILTAWuXq7/+dtlOhab5K4=
3434
github.com/obalunenko/logger v1.2.0 h1:MwsqJWtaxaHFQK7Cjkqk1NnlNPHH+tR1ergdnpST7Kg=
3535
github.com/obalunenko/logger v1.2.0/go.mod h1:XaU3GhUJWda3ow3hhRjlItpIVgQRKa2KDsEeprSzBvg=
36-
github.com/obalunenko/version v1.2.0 h1:eUYme2w38fjzcvToInTGM85xAJycZHo65GvynbH8jCo=
37-
github.com/obalunenko/version v1.2.0/go.mod h1:kXnCfV2LUe+UHRrzjwPC/5lpnPbypwmLZh7BJx7wG1A=
36+
github.com/obalunenko/version v1.3.0 h1:WM1uoZ3e3n/y1RVHaCMFAPeRcrq8ihQQgrSkilB3uLo=
37+
github.com/obalunenko/version v1.3.0/go.mod h1:56ydLXefFem3sEJ2iyguuZ7dwJ25VoIRTev/JfxFIa4=
3838
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3939
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
4040
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=

scripts/build/app.sh

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,8 @@ APP=${APP_NAME}
2121

2222
echo "Building ${APP}..."
2323

24-
COMMIT="$(git rev-parse HEAD)"
25-
SHORTCOMMIT="$(git rev-parse --short HEAD)"
26-
DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
27-
VERSION="$(git tag | sort -V | tail -1)"
28-
GOVERSION="$(go version | awk '{print $3;}')"
29-
30-
if [ -z "${VERSION}" ] || [ "${VERSION}" = "${SHORTCOMMIT}" ]; then
31-
VERSION="v0.0.0"
32-
fi
33-
34-
if [[ $(git diff --stat) != '' ]]; then
35-
echo 'dirty'
36-
37-
COMMIT="${COMMIT}-dirty"
38-
SHORTCOMMIT="${SHORTCOMMIT}-dirty"
39-
VERSION="${VERSION}-dirty"
40-
fi
41-
4224
BIN_OUT="${BIN_DIR}/${APP}"
4325

44-
BUILDINFO_VARS_PKG=github.com/obalunenko/version
45-
export GO_BUILD_LDFLAGS="-s -w \
46-
-X ${BUILDINFO_VARS_PKG}.version=${VERSION} \
47-
-X ${BUILDINFO_VARS_PKG}.commit=${COMMIT} \
48-
-X ${BUILDINFO_VARS_PKG}.shortcommit=${SHORTCOMMIT} \
49-
-X ${BUILDINFO_VARS_PKG}.builddate=${DATE} \
50-
-X ${BUILDINFO_VARS_PKG}.appname=${APP} \
51-
-X ${BUILDINFO_VARS_PKG}.goversion=${GOVERSION}"
52-
5326
rm -rf "${BIN_OUT}"
5427

5528
goreleaser build --skip=validate --clean --single-target --output "${BIN_OUT}"

vendor/github.com/obalunenko/version/README.md

Lines changed: 14 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)