fix: resolve conflict lock file

apache · Nov 29, 2023 · 619149f · 619149f
2 parents 8ddaba8 + 1a76d0a
commit 619149f
Show file tree

Hide file tree

Showing 107 changed files with 3,411 additions and 210 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -17,7 +17,7 @@
 
 # NOTE: All configurations could be found here: https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features
 github:
-  description: "A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Answer."
+  description: "A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer."
   homepage: https://answer.apache.org
   labels:
     - react

diff --git a/.github/workflows/build_goreleaser.yml → ...ub/workflows/build-binary-for-release.yml b/.github/workflows/build_goreleaser.yml → ...ub/workflows/build-binary-for-release.yml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: "Goreleaser"
+name: Build Binary For Release
 
 on:
   push:
@@ -26,7 +26,7 @@ permissions:
 
 jobs:
   build-goreleaser:
-    runs-on: [self-hosted, linux]
+    runs-on: ubuntu-latest
 
     steps:
     - name: Checkout

diff --git a/.github/workflows/manual_build.yml → .github/workflows/build-image-for-manual.yml b/.github/workflows/manual_build.yml → .github/workflows/build-image-for-manual.yml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: Manual Build DockerHub Image
+name: Manual Build Docker Image For Release
 
 on:
   workflow_dispatch:
@@ -24,21 +24,6 @@ on:
         type: string
         required: true
         description: 'DockerHub img tag name'
-      logLevel:
-        description: 'Log level'
-        required: true
-        default: 'warning'
-        type: choice
-        options:
-        - info
-        - warning
-        - debug
-      tags:
-        description: 'Test scenario tags'
-        required: false
-        type: boolean
-
-
 
 jobs:
   build:
@@ -51,7 +36,7 @@ jobs:
       id: meta
       uses: docker/metadata-action@v4
       with:
-        images: answerdev/answer
+        images: apache/answer
         tags: |
           type=ref,enable=true,priority=600,prefix=,suffix=,event=branch
           type=semver,pattern={{version}}
@@ -63,10 +48,10 @@ jobs:
       uses: docker/setup-buildx-action@v2
 
     - name: Login to DockerHub
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        username: ${{ secrets.DOCKERHUB_USER }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Build and push
       uses: docker/build-push-action@v4
@@ -75,7 +60,5 @@ jobs:
         platforms: linux/amd64,linux/arm64
         push: true
         file: ./Dockerfile
-        tags: answerdev/answer:${{ inputs.tag_name }}
+        tags: apache/answer:${{ inputs.tag_name }}
         labels: ${{ steps.meta.outputs.labels }}
-
-
diff --git a/.github/workflows/build_dockerhub_img.yml → ...hub/workflows/build-image-for-release.yml b/.github/workflows/build_dockerhub_img.yml → ...hub/workflows/build-image-for-release.yml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: Build DockerHub Image
+name: Build Docker Image For Release
 
 on:
   push:
@@ -29,7 +29,7 @@ on:
 
 jobs:
   build:
-    runs-on: [self-hosted, linux]
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -38,7 +38,7 @@ jobs:
       id: meta
       uses: docker/metadata-action@v4
       with:
-        images: answerdev/answer
+        images: apache/answer
         tags: |
           type=raw,value=latest
           type=ref,enable=true,priority=600,prefix=,suffix=,event=branch
@@ -51,10 +51,10 @@ jobs:
       uses: docker/setup-buildx-action@v2
 
     - name: Login to DockerHub
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        username: ${{ secrets.DOCKERHUB_USER }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Build and push
       uses: docker/build-push-action@v4

diff --git a/.github/workflows/build_dev_img.yml → .github/workflows/build-image-for-test.yml b/.github/workflows/build_dev_img.yml → .github/workflows/build-image-for-test.yml
@@ -15,17 +15,16 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: Build Dev Image
+name: Build Docker Image For Test
 
 on:
   push:
-    branches: [ "test","dev" ]
-
+    branches: [ "test" ]
 
 jobs:
   build:
     name: Build and Push
-    runs-on: [self-hosted,linux]
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -34,24 +33,21 @@ jobs:
       id: meta
       uses: docker/metadata-action@v4
       with:
-        images: ${{ secrets.IMG_URL }}/${{ secrets.IMG_NAMESPACE }}/answer
+        images: apache/answer
         tags: |
-          type=raw,value=latest
-
+          type=raw,value=test
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
 
-    - name: Login to  Container Registry
-      uses: docker/login-action@v2
+    - name: Login to DockerHub
+      uses: docker/login-action@v3
       with:
-        registry: ${{ secrets.IMG_URL }}
-        username: ${{ secrets.IMG_USERNAME }}
-        password: ${{ secrets.IMG_PASSWORD }}
-
+        username: ${{ secrets.DOCKERHUB_USER }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Build and push
       uses: docker/build-push-action@v4
@@ -62,18 +58,3 @@ jobs:
         push: true
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
-
-  sync-git:
-    name: Sync to Git
-    runs-on: [self-hosted,linux]
-    needs:
-      - build
-    steps:
-      - name: Sync to Gitlab
-        uses: aiworklab/git-mirror-action@master
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.GITLAB_RSA_PRIVATE_KEY }}
-        with:
-          source-repo: [email protected]:apache/incubator-answer.git
-          destination-repo: ${{ secrets.GITLAB_REPO }}
-
diff --git a/.github/workflows/ci.yml → .github/workflows/check-asf-header.yml b/.github/workflows/ci.yml → .github/workflows/check-asf-header.yml
@@ -41,6 +41,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Check license header
         uses: korandoru/hawkeye@v3
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -55,11 +55,16 @@ builds:
 
 archives:
   - name_template: >-
-      {{ .ProjectName }}_
-      {{- title .Os }}_
-      {{- if eq .Arch "amd64" }}x86_64
-      {{- else if eq .Arch "386" }}i386
-      {{- else }}{{ .Arch }}{{ end }}
+      apache-answer-{{ .Version }}-incubating-{{ .Os }}-{{ .Arch }}
+    files:
+      - src: "docs/release/LICENSE"
+        dst: LICENSE
+      - src: "docs/release/NOTICE"
+        dst: NOTICE
+      - src: "docs/release/licenses/*"
+        dst: licenses/
+      - src: "DISCLAIMER"
+        dst: DISCLAIMER
 checksum:
   name_template: 'checksums.txt'
 snapshot:

diff --git a/Dockerfile b/Dockerfile
@@ -20,7 +20,7 @@ LABEL maintainer="[email protected]"
 
 ARG GOPROXY
 # ENV GOPROXY ${GOPROXY:-direct}
-ENV GOPROXY=https://proxy.golang.com.cn,direct
+# ENV GOPROXY=https://proxy.golang.com.cn,direct
 
 ENV GOPATH /go
 ENV GOROOT /usr/local/go

diff --git a/Makefile b/Makefile
@@ -43,4 +43,8 @@ install-ui-packages:
 ui:
 	@cd ui && pnpm pre-install && pnpm build && cd -
 
+lint: generate
+	@bash ./script/check-asf-header.sh
+	@gofmt -w -l .
+
 all: clean build
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
     <img alt="logo" src="docs/img/logo.svg" height="99px">
 </a>
 
-# Answer - Build Q&A platform
+# Apache Answer - Build Q&A platform
 
 A Q&A platform software for teams at any scales. Whether it’s a community forum, help center, or knowledge management platform, you can always count on Answer.
 
@@ -30,17 +30,32 @@ For more information, see [Installation](https://answer.apache.org/docs/installa
 
 ### Plugins
 
-Answer provides a plugin system for developers to create custom plugins and expand Answer’s features. You can find the [plugin documentation here](https://answer.apache.org/docs/development/extending/).
+Answer provides a plugin system for developers to create custom plugins and expand Answer’s features. You can find the [plugin documentation here](https://answer.apache.org/community/plugins).
 
 We value your feedback and suggestions to improve our documentation. If you have any comments or questions, please feel free to contact us. We’re excited to see what you can create using our plugin system!
 
-You can also check out the [plugins here](https://github.com/apache/incubator-answer-plugins).
+You can also check out the [plugins here](https://answer.apache.org/plugins).
+
+## Building from Source
+
+### Prerequisites
+
+- Golang >= 1.18
+- Node.js >= 16.17
+- pnpm >= 8
+
+### Build
+
+```bash
+$ make ui
+$ make build
+```
 
 ## Contributing
 
 Contributions are always welcome!
 
-See [CONTRIBUTING](https://answer.apache.org/docs/development/contributing/) for ways to get started.
+See [CONTRIBUTING](https://answer.apache.org/community/contributing) for ways to get started.
 
 ## License
 

diff --git a/README_CN.md b/README_CN.md
diff --git a/SECURITY.md b/SECURITY.md
diff --git a/charts/templates/_helpers.tpl b/charts/templates/_helpers.tpl
@@ -1,5 +1,22 @@
 {{/*
-Expand the name of the chart.
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
 */}}
 {{- define "answer.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}

diff --git a/charts/templates/hpa.yaml b/charts/templates/hpa.yaml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-{{- if .Values.autoscaling.enabled }}
+{{ if .Values.autoscaling.enabled -}}
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:

diff --git a/charts/templates/ingress.yaml b/charts/templates/ingress.yaml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-{{- if .Values.ingress.enabled -}}
+{{ if .Values.ingress.enabled -}}
 {{- $fullName := include "answer.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}

diff --git a/charts/templates/pvc.yaml b/charts/templates/pvc.yaml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-{{- if .Values.persistence.enabled }}
+{{ if .Values.persistence.enabled -}}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata: