Skip to content

Commit 9778889

Browse files
Copilotkamilon
andauthored
Merge origin/main and resolve codecov workflow conflict
Co-authored-by: kamilon <14920646+kamilon@users.noreply.github.com>
2 parents 938d897 + 2fd85d1 commit 9778889

5 files changed

Lines changed: 18 additions & 18 deletions

File tree

.github/workflows/build.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
- name: Docker meta
5050
id: docker_meta
51-
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 #v5.10.0
51+
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf #v6.0.0
5252
with:
5353
images: |
5454
${{ github.repository }}
@@ -69,24 +69,24 @@ jobs:
6969
platforms: ${{ matrix.platform }}
7070

7171
- name: Set up Docker Buildx
72-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f #v3.12.0
72+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd #v4.0.0
7373

7474
- name: Login to DockerHub
75-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 #v3.7.0
75+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 #v4.1.0
7676
with:
7777
username: ${{ vars.DOCKERHUB_USERNAME }}
7878
password: ${{ secrets.DOCKERHUB_TOKEN }}
7979

8080
- name: Login to GitHub Container Registry
81-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 #v3.7.0
81+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 #v4.1.0
8282
with:
8383
registry: ghcr.io
8484
username: ${{ github.actor }}
8585
password: ${{ secrets.GITHUB_TOKEN }}
8686

8787
- name: Build and push (${{ matrix.platform }})
8888
id: docker_build
89-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 #v6.19.2
89+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f #v7.1.0
9090
with:
9191
context: .
9292
platforms: ${{ matrix.platform }}
@@ -141,7 +141,7 @@ jobs:
141141

142142
- name: Docker meta
143143
id: docker_meta
144-
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 #v5.10.0
144+
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf #v6.0.0
145145
with:
146146
images: |
147147
${{ github.repository }}
@@ -156,26 +156,26 @@ jobs:
156156
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
157157

158158
- name: Download digests
159-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 #v8.0.0
159+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c #v8.0.1
160160
with:
161161
path: ${{ runner.temp }}/digests
162162
pattern: digests-*
163163
merge-multiple: true
164164

165165
- name: Install Cosign
166-
uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad #v4.0.0
166+
uses: sigstore/cosign-installer@cad07c2e89fa2edd6e2d7bab4c1aa38e53f76003 #v4.1.1
167167

168168
- name: Set up Docker Buildx
169-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f #v3.12.0
169+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd #v4.0.0
170170

171171
- name: Login to DockerHub
172-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 #v3.7.0
172+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 #v4.1.0
173173
with:
174174
username: ${{ vars.DOCKERHUB_USERNAME }}
175175
password: ${{ secrets.DOCKERHUB_TOKEN }}
176176

177177
- name: Login to GitHub Container Registry
178-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 #v3.7.0
178+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 #v4.1.0
179179
with:
180180
registry: ghcr.io
181181
username: ${{ github.actor }}

.github/workflows/codecov.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
1717

1818
- name: Setup go
19-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 #v6.3.0
19+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c #v6.4.0
2020
with:
2121
go-version-file: go.mod
2222

2323
- name: Connect to Tailnet
2424
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository || contains(fromJson('["kamilon", "tobiasehlert"]'), github.actor)
25-
uses: tailscale/github-action@53acf823325fe9ca47f4cdaa951f90b4b0de5bb9 #v4.1.1
25+
uses: tailscale/github-action@306e68a486fd2350f2bfc3b19fcd143891a4a2d8 #v4.1.2
2626
with:
2727
args: --accept-dns=true
2828
oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
@@ -35,7 +35,7 @@ jobs:
3535
go test -race -coverprofile=coverage.out -covermode=atomic `go list ./... | grep -v vendor/` -v
3636
3737
- name: Uploading coverage to Codecov
38-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de #v5.5.2
38+
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 #v6.0.0
3939
with:
4040
token: ${{ secrets.CODECOV_TOKEN }}
4141
slug: TibiaData/tibiadata-api-go

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
2828

2929
- name: Setup go
30-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 #v6.3.0
30+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c #v6.4.0
3131
with:
3232
go-version-file: go.mod
3333

.github/workflows/documentation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
1616

1717
- name: Set up Go
18-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 #v6.3.0
18+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c #v6.4.0
1919
with:
2020
go-version-file: go.mod
2121

@@ -34,7 +34,7 @@ jobs:
3434
echo "${contents}" > docs/swagger.json
3535
3636
- name: Upload swagger.json to release page
37-
uses: svenstaro/upload-release-action@b98a3b12e86552593f3e4e577ca8a62aa2f3f22b #2.11.4
37+
uses: svenstaro/upload-release-action@29e53e917877a24fad85510ded594ab3c9ca12de #2.11.5
3838
with:
3939
repo_token: ${{ secrets.GITHUB_TOKEN }}
4040
file: docs/swagger.json

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN go mod download && \
2424

2525

2626
# get alpine container
27-
FROM alpine:3.23.3 AS app
27+
FROM alpine:3.23.4 AS app
2828

2929
# create workdir
3030
WORKDIR /opt/app

0 commit comments

Comments
 (0)