Skip to content

Commit 75a8baf

Browse files
authored
Merge branch 'master' into 2023/day02
2 parents b3bdeea + 9a020d3 commit 75a8baf

File tree

19 files changed

+111
-44
lines changed

19 files changed

+111
-44
lines changed

.github/workflows/go.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
shell: bash
6161
6262
- name: Set up cache
63-
uses: actions/cache@v3
63+
uses: actions/cache@v4
6464
env:
6565
cache-name: cache-vendored-tools-${{ secrets.CACHE_VERSION }}
6666
with:
@@ -117,7 +117,7 @@ jobs:
117117
shell: bash
118118
119119
- name: Set up cache
120-
uses: actions/cache@v3
120+
uses: actions/cache@v4
121121
env:
122122
cache-name: cache-vendored-tools-${{ secrets.CACHE_VERSION }}
123123
with:
@@ -173,7 +173,7 @@ jobs:
173173
shell: bash
174174

175175
- name: Set up cache
176-
uses: actions/cache@v3
176+
uses: actions/cache@v4
177177
env:
178178
cache-name: cache-vendored-tools-${{ secrets.CACHE_VERSION }}
179179
with:
@@ -220,7 +220,7 @@ jobs:
220220
shell: bash
221221
222222
- name: Set up cache
223-
uses: actions/cache@v3
223+
uses: actions/cache@v4
224224
env:
225225
cache-name: cache-vendored-tools-${{ secrets.CACHE_VERSION }}
226226
with:
@@ -254,7 +254,7 @@ jobs:
254254
shell: bash
255255

256256
- name: SonarCloud report upload
257-
uses: sonarsource/sonarcloud-github-action@v1.9
257+
uses: sonarsource/sonarcloud-github-action@v2.1
258258
env:
259259
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
260260
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
shell: bash
3434
3535
- name: Set up cache
36-
uses: actions/cache@v3
36+
uses: actions/cache@v4
3737
env:
3838
cache-name: cache-vendored-tools-${{ secrets.CACHE_VERSION }}
3939
with:
@@ -79,7 +79,7 @@ jobs:
7979
shell: bash
8080
8181
- name: Set up cache
82-
uses: actions/cache@v3
82+
uses: actions/cache@v4
8383
env:
8484
cache-name: cache-vendored-tools-${{ secrets.CACHE_VERSION }}
8585
with:
@@ -128,7 +128,7 @@ jobs:
128128
shell: bash
129129
130130
- name: Set up cache
131-
uses: actions/cache@v3
131+
uses: actions/cache@v4
132132
env:
133133
cache-name: cache-vendored-tools-${{ secrets.CACHE_VERSION }}
134134
with:

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.3.4 AS builder
1+
FROM ghcr.io/obalunenko/go-tools:v1.4.0 AS builder
22

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

go.mod

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
module github.com/obalunenko/advent-of-code
22

33
go 1.21
4+
toolchain go1.22.0
45

56
require (
67
github.com/briandowns/spinner v1.23.0
78
github.com/manifoldco/promptui v0.9.0
8-
github.com/obalunenko/getenv v1.12.1
9-
github.com/obalunenko/logger v1.0.1
10-
github.com/obalunenko/version v1.1.0
9+
github.com/obalunenko/getenv v1.13.0
10+
github.com/obalunenko/logger v1.1.0
11+
github.com/obalunenko/version v1.2.0
1112
github.com/savioxavier/termlink v1.3.0
1213
github.com/stretchr/testify v1.8.4
13-
github.com/urfave/cli/v2 v2.26.0
14+
github.com/urfave/cli/v2 v2.27.1
1415
)
1516

1617
require (
@@ -23,7 +24,7 @@ require (
2324
github.com/pmezard/go-difflib v1.0.0 // indirect
2425
github.com/russross/blackfriday/v2 v2.1.0 // indirect
2526
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
26-
golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect
27+
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
2728
golang.org/x/sys v0.6.0 // indirect
2829
golang.org/x/term v0.6.0 // indirect
2930
gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
1919
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
2020
github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
2121
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
22-
github.com/obalunenko/getenv v1.12.1 h1:16dfwnXa5AhZuScaT4qAxUapwpRBxTAdKmsHwc/aDvQ=
23-
github.com/obalunenko/getenv v1.12.1/go.mod h1:GtEy59H7644JXfVjxDFo1jEUe1yJ4asSyPwN8D19Pvs=
24-
github.com/obalunenko/logger v1.0.1 h1:XERBQry7q7Kxr6lDeh9RLsUr7oZj+T5J845B4RPxORE=
25-
github.com/obalunenko/logger v1.0.1/go.mod h1:BLGJLvxm4ImsjuGVOjrx59VUsbsLR2f7IkVPFjLyBvg=
26-
github.com/obalunenko/version v1.1.0 h1:yVua7OHnK3+MJpendeMmAlfzVmq7R1h8MO3Ufz7HEec=
27-
github.com/obalunenko/version v1.1.0/go.mod h1:Or267aCQxNcAtgOeWA7yOe/RqJS4XDaMfcFwk3ohbOg=
22+
github.com/obalunenko/getenv v1.13.0 h1:KE6Kky3OMLkvOgzfZkaOjodnnMawhEEuju4Hbs7DCt0=
23+
github.com/obalunenko/getenv v1.13.0/go.mod h1:z/14VQJlEBeaa/JI/RNufa/EQOSDVA2RRUz56ukYOM0=
24+
github.com/obalunenko/logger v1.1.0 h1:Q5drJuCuwz16mm96tcrl5e20uoGSOI4O+VWSauR/mQg=
25+
github.com/obalunenko/logger v1.1.0/go.mod h1:rS66dO9P2j/lybFrDB0Sce1DEVaOi6ag6WDIzljTg8c=
26+
github.com/obalunenko/version v1.2.0 h1:eUYme2w38fjzcvToInTGM85xAJycZHo65GvynbH8jCo=
27+
github.com/obalunenko/version v1.2.0/go.mod h1:kXnCfV2LUe+UHRrzjwPC/5lpnPbypwmLZh7BJx7wG1A=
2828
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2929
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
3030
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
@@ -33,12 +33,12 @@ github.com/savioxavier/termlink v1.3.0 h1:3Gl4FzQjUyiHzmoEDfmWEhgIwDiJY4poOQHP+k
3333
github.com/savioxavier/termlink v1.3.0/go.mod h1:5T5ePUlWbxCHIwyF8/Ez1qufOoGM89RCg9NvG+3G3gc=
3434
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
3535
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
36-
github.com/urfave/cli/v2 v2.26.0 h1:3f3AMg3HpThFNT4I++TKOejZO8yU55t3JnnSr4S4QEI=
37-
github.com/urfave/cli/v2 v2.26.0/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
36+
github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
37+
github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
3838
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
3939
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
40-
golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 h1:EDuYyU/MkFXllv9QF9819VlI9a4tzGuCbhG0ExK9o1U=
41-
golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
40+
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE=
41+
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
4242
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
4343
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4444
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

vendor/github.com/obalunenko/getenv/Makefile

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

vendor/github.com/obalunenko/logger/Makefile

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

vendor/github.com/obalunenko/version/version.go

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

vendor/github.com/urfave/cli/v2/.golangci.yaml

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

vendor/github.com/urfave/cli/v2/app.go

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

0 commit comments

Comments
 (0)