Skip to content

Commit 3a5e6c2

Browse files
committed
Merge branch 'release/2.0.1' into apache
2 parents d32694a + 1d7ef0c commit 3a5e6c2

7 files changed

Lines changed: 30 additions & 33 deletions

.github/workflows/build-binary-for-release.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,24 @@ jobs:
3434
uses: actions/checkout@v4
3535

3636
- name: Set up Node
37-
uses: actions/setup-node@v3
37+
uses: actions/setup-node@v4
3838
with:
3939
node-version: 20.18.1
4040

4141
- name: Node Build
4242
run: make install-ui-packages ui
4343

4444
- name: Setup Go
45-
uses: actions/setup-go@v3
45+
uses: actions/setup-go@v5
4646
with:
4747
go-version: 1.23
48+
49+
- name: Install GoReleaser
50+
run: go install github.com/goreleaser/goreleaser/v2@latest
51+
4852
- name: Run GoReleaser
49-
uses: goreleaser/goreleaser-action@v4
50-
with:
51-
distribution: goreleaser
52-
version: latest
53-
args: release --clean --skip=validate
53+
run: |
54+
"$(go env GOPATH)/bin/goreleaser" release --clean --skip=validate
5455
env:
5556
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5657
- uses: actions/upload-artifact@v4

.github/workflows/build-image-for-latest-release.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,32 +37,30 @@ jobs:
3737

3838
- name: Docker meta
3939
id: meta
40-
uses: docker/metadata-action@v4
40+
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
4141
with:
4242
images: apache/answer
4343
tags: |
4444
type=raw,value=latest
4545
4646
- name: Set up QEMU
47-
uses: docker/setup-qemu-action@v2
47+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
4848

4949
- name: Set up Docker Buildx
50-
uses: docker/setup-buildx-action@v2
50+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
5151

5252
- name: Login to DockerHub
53-
uses: docker/login-action@v3
53+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
5454
with:
5555
username: ${{ secrets.DOCKERHUB_USER }}
5656
password: ${{ secrets.DOCKERHUB_TOKEN }}
5757

5858
- name: Build and push
59-
uses: docker/build-push-action@v4
59+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
6060
with:
6161
context: .
6262
platforms: linux/amd64,linux/arm64
6363
push: true
6464
file: ./Dockerfile
6565
tags: ${{ steps.meta.outputs.tags }}
6666
labels: ${{ steps.meta.outputs.labels }}
67-
68-

.github/workflows/build-image-for-manual.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,27 @@ jobs:
3535

3636
- name: Docker meta
3737
id: meta
38-
uses: docker/metadata-action@v4
38+
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
3939
with:
4040
images: apache/answer
4141
tags: |
4242
type=ref,enable=true,priority=600,prefix=,suffix=,event=branch
4343
type=semver,pattern={{version}}
4444
4545
- name: Set up QEMU
46-
uses: docker/setup-qemu-action@v2
46+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
4747

4848
- name: Set up Docker Buildx
49-
uses: docker/setup-buildx-action@v2
49+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
5050

5151
- name: Login to DockerHub
52-
uses: docker/login-action@v3
52+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
5353
with:
5454
username: ${{ secrets.DOCKERHUB_USER }}
5555
password: ${{ secrets.DOCKERHUB_TOKEN }}
5656

5757
- name: Build and push
58-
uses: docker/build-push-action@v4
58+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
5959
with:
6060
context: .
6161
platforms: linux/amd64,linux/arm64

.github/workflows/build-image-for-release.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,33 +36,31 @@ jobs:
3636

3737
- name: Docker meta
3838
id: meta
39-
uses: docker/metadata-action@v4
39+
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
4040
with:
4141
images: apache/answer
4242
tags: |
4343
type=ref,enable=true,priority=600,prefix=,suffix=,event=branch
4444
type=semver,pattern={{version}}
4545
4646
- name: Set up QEMU
47-
uses: docker/setup-qemu-action@v2
47+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
4848

4949
- name: Set up Docker Buildx
50-
uses: docker/setup-buildx-action@v2
50+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
5151

5252
- name: Login to DockerHub
53-
uses: docker/login-action@v3
53+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
5454
with:
5555
username: ${{ secrets.DOCKERHUB_USER }}
5656
password: ${{ secrets.DOCKERHUB_TOKEN }}
5757

5858
- name: Build and push
59-
uses: docker/build-push-action@v4
59+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
6060
with:
6161
context: .
6262
platforms: linux/amd64,linux/arm64
6363
push: true
6464
file: ./Dockerfile
6565
tags: ${{ steps.meta.outputs.tags }}
6666
labels: ${{ steps.meta.outputs.labels }}
67-
68-

.github/workflows/build-image-for-test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,26 @@ jobs:
3232

3333
- name: Docker meta
3434
id: meta
35-
uses: docker/metadata-action@v4
35+
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
3636
with:
3737
images: apache/answer
3838
tags: |
3939
type=raw,value=test
4040
4141
- name: Set up QEMU
42-
uses: docker/setup-qemu-action@v2
42+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
4343

4444
- name: Set up Docker Buildx
45-
uses: docker/setup-buildx-action@v2
45+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
4646

4747
- name: Login to DockerHub
48-
uses: docker/login-action@v3
48+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
4949
with:
5050
username: ${{ secrets.DOCKERHUB_USER }}
5151
password: ${{ secrets.DOCKERHUB_TOKEN }}
5252

5353
- name: Build and push
54-
uses: docker/build-push-action@v4
54+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
5555
with:
5656
context: .
5757
file: ./Dockerfile

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY: build clean ui
22

3-
VERSION=2.0.0
3+
VERSION=2.0.1
44
BIN=answer
55
DIR_SRC=./cmd/answer
66
DOCKER_CMD=docker

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ To learn more about the project, visit [answer.apache.org](https://answer.apache
2323
### Running with docker
2424

2525
```bash
26-
docker run -d -p 9080:80 -v answer-data:/data --name answer apache/answer:2.0.0
26+
docker run -d -p 9080:80 -v answer-data:/data --name answer apache/answer:2.0.1
2727
```
2828

2929
For more information, see [Installation](https://answer.apache.org/docs/installation).

0 commit comments

Comments
 (0)