Skip to content

Commit 9927372

Browse files
LinkinStarstisonkunshuashuai
committed
Add dependencies license for release binary (#610)
The files that in the `docs/release` will be pack into binary release zip. - [x] put all the dependency licenses into `docs/release/licenses`. - [x] add LICENSE for release binary. (We need to check this format whether meet the requirements or not.) - [x] add NOTICE for release binary. --------- Co-authored-by: tison <[email protected]> Co-authored-by: shuai <[email protected]>
1 parent 9cb99e7 commit 9927372

File tree

81 files changed

+3206
-201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+3206
-201
lines changed

.github/workflows/build_goreleaser.yml renamed to .github/workflows/build-binary-for-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
name: "Goreleaser"
18+
name: Build Binary For Release
1919

2020
on:
2121
push:
@@ -26,7 +26,7 @@ permissions:
2626

2727
jobs:
2828
build-goreleaser:
29-
runs-on: [self-hosted, linux]
29+
runs-on: ubuntu-latest
3030

3131
steps:
3232
- name: Checkout

.github/workflows/build_dockerhub_img.yml renamed to .github/workflows/build-image-for-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
name: Build DockerHub Image
18+
name: Build Docker Image For Release
1919

2020
on:
2121
push:
@@ -29,7 +29,7 @@ on:
2929

3030
jobs:
3131
build:
32-
runs-on: [self-hosted, linux]
32+
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout
3535
uses: actions/checkout@v4
@@ -38,7 +38,7 @@ jobs:
3838
id: meta
3939
uses: docker/metadata-action@v4
4040
with:
41-
images: answerdev/answer
41+
images: apache/answer
4242
tags: |
4343
type=raw,value=latest
4444
type=ref,enable=true,priority=600,prefix=,suffix=,event=branch

.github/workflows/manual_build.yml renamed to .github/workflows/build-image-for-test.yml

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,15 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
name: Manual Build DockerHub Image
18+
name: Build Docker Image For Test
1919

2020
on:
21-
workflow_dispatch:
22-
inputs:
23-
tag_name:
24-
type: string
25-
required: true
26-
description: 'DockerHub img tag name'
27-
logLevel:
28-
description: 'Log level'
29-
required: true
30-
default: 'warning'
31-
type: choice
32-
options:
33-
- info
34-
- warning
35-
- debug
36-
tags:
37-
description: 'Test scenario tags'
38-
required: false
39-
type: boolean
40-
41-
21+
push:
22+
branches: [ "test" ]
4223

4324
jobs:
4425
build:
26+
name: Build and Push
4527
runs-on: ubuntu-latest
4628
steps:
4729
- name: Checkout
@@ -51,10 +33,9 @@ jobs:
5133
id: meta
5234
uses: docker/metadata-action@v4
5335
with:
54-
images: answerdev/answer
36+
images: apache/answer
5537
tags: |
56-
type=ref,enable=true,priority=600,prefix=,suffix=,event=branch
57-
type=semver,pattern={{version}}
38+
type=raw,value=test
5839
5940
- name: Set up QEMU
6041
uses: docker/setup-qemu-action@v2
@@ -72,10 +53,8 @@ jobs:
7253
uses: docker/build-push-action@v4
7354
with:
7455
context: .
75-
platforms: linux/amd64,linux/arm64
76-
push: true
7756
file: ./Dockerfile
78-
tags: answerdev/answer:${{ inputs.tag_name }}
57+
platforms: linux/amd64
58+
push: true
59+
tags: ${{ steps.meta.outputs.tags }}
7960
labels: ${{ steps.meta.outputs.labels }}
80-
81-

.github/workflows/build_dev_img.yml

Lines changed: 0 additions & 79 deletions
This file was deleted.

.github/workflows/build_test.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

.github/workflows/ci.yml renamed to .github/workflows/check-asf-header.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ jobs:
4141
runs-on: ubuntu-latest
4242
timeout-minutes: 10
4343
steps:
44-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4
4545
- name: Check license header
4646
uses: korandoru/hawkeye@v3

.goreleaser.yaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,16 @@ builds:
5555

5656
archives:
5757
- name_template: >-
58-
{{ .ProjectName }}_
59-
{{- title .Os }}_
60-
{{- if eq .Arch "amd64" }}x86_64
61-
{{- else if eq .Arch "386" }}i386
62-
{{- else }}{{ .Arch }}{{ end }}
58+
apache-answer-{{ .Version }}-incubating-{{ .Os }}-{{ .Arch }}
59+
files:
60+
- src: "docs/release/LICENSE"
61+
dst: LICENSE
62+
- src: "docs/release/NOTICE"
63+
dst: NOTICE
64+
- src: "docs/release/licenses/*"
65+
dst: licenses/
66+
- src: "DISCLAIMER"
67+
dst: DISCLAIMER
6368
checksum:
6469
name_template: 'checksums.txt'
6570
snapshot:

charts/templates/_helpers.tpl

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
{{/*
2-
Expand the name of the chart.
2+
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing,
14+
software distributed under the License is distributed on an
15+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
KIND, either express or implied. See the License for the
17+
specific language governing permissions and limitations
18+
under the License.
19+
320
*/}}
421
{{- define "answer.name" -}}
522
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}

0 commit comments

Comments
 (0)