Skip to content

Commit

Permalink
Merge branch 'apache:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
davidyuan1223 authored Apr 2, 2023
2 parents c48ad38 + 726a831 commit 16237c2
Show file tree
Hide file tree
Showing 573 changed files with 20,813 additions and 6,458 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
.github/ export-ignore
.idea/ export-ignore
.readthedocs.yml export-ignore
.travis.yml export-ignore
_config.yml export-ignore
codecov.yml export-ignore
licenses-binary/ export-ignore
Expand Down
109 changes: 109 additions & 0 deletions .github/ISSUE_TEMPLATE/dependency.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
#
# 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.
#

# See https://gh-community.github.io/issue-template-feedback/structured/

name: Dependency
title: ":arrow_up: Upgrade <artifact> from <current version> to <target version>"
description: Keep upstream dependencies fresh and stable
labels: [ "kind:build, priority:major, good first issue, help wanted" ]
body:
- type: markdown
attributes:
value: |
Thank you for finding the time to report the issue! We really appreciate the community's efforts to improve Kyuubi.
It doesn't really matter whether what you are reporting is a bug or not, just feel free to share the problem you have
encountered with the community. For best practices, if it is indeed a bug, please try your best to provide the reproducible
steps. If you want to ask questions or share ideas, please [subscribe to our mailing list](mailto:[email protected])
and send emails to [our mailing list](mailto:[email protected]), you can also head to our
[Discussions](https://github.com/apache/kyuubi/discussions) tab.
- type: checkboxes
attributes:
label: Code of Conduct
description: The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it.
options:
- label: >
I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
required: true
- type: checkboxes
attributes:
label: Search before asking
options:
- label: >
I have searched in the [issues](https://github.com/apache/kyuubi/issues?q=is%3Aissue) and found no similar
issues.
required: true
- type: dropdown
id: priority
attributes:
label: Why do we need to upgrade this artifact?
options:
- Common Vulnerabilities and Exposures (CVE)
- Bugfixes
- Usage of New Features
- Performance Improvements
- Regular Updates
validations:
required: true

- type: input
id: artifact
attributes:
label: Artifact Name
description: Which artifact shall be upgraded?
placeholder: e.g. spark-sql
value: https://mvnrepository.com/search?q=
validations:
required: true

- type: input
id: versions
attributes:
label: Target Version
description: Which version shall be upgraded?
placeholder: e.g. 1.2.1
validations:
required: true

- type: textarea
id: changes
attributes:
label: Notable Changes
description: Please provide notable changes, or release notes if any
validations:
required: false

- type: checkboxes
attributes:
label: Are you willing to submit PR?
description: >
A pull request is optional, but we are glad to help you in the contribution process
especially if you already know a good understanding of how to implement the fix.
Kyuubi is a community-driven project and we love to bring new contributors in.
options:
- label: Yes. I would be willing to submit a PR with guidance from the Kyuubi community to fix.
- label: No. I cannot submit a PR at this time.

- type: markdown
attributes:
value: >
After changing the corresponding dependency version and before submitting your pull request,
it is necessary to execute `build/dependency.sh --replace` locally to update `dev/dependencyList`.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ Please clarify why the changes are needed. For instance,

- [ ] Add screenshots for manual tests if appropriate

- [ ] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request
- [ ] [Run test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests) locally before make a pull request
27 changes: 27 additions & 0 deletions .github/actions/cache-engine-archives/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#
# 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.
#

name: cache-engine-archives
description: 'Cache download engine archives from Apache Archives website used by Maven download plugin'
runs:
using: composite
steps:
- name: Cache Engine Archives
uses: actions/cache@v3
with:
path: /tmp/engine-archives
key: engine-archives
35 changes: 35 additions & 0 deletions .github/actions/setup-mvnd/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#
# 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.
#

name: 'setup-mvnd'
description: 'Setup Maven and Mvnd'
runs:
using: composite
steps:
- name: Cache Mvnd
uses: actions/cache@v3
with:
path: |
build/maven-mvnd-*
build/apache-maven-*
key: setup-mvnd-${{ runner.os }}
- name: Check Maven
run: build/mvn -v
shell: bash
- name: Check Mvnd
run: build/mvnd -v || true
shell: bash
7 changes: 5 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
- ".gitattributes"
- ".github/**/*"
- ".gitignore"
- ".travis.yml"
- "LICENSE"
- "LICENSE-binary"
- "NOTICE"
Expand Down Expand Up @@ -103,7 +102,8 @@

"module:server":
- "bin/kyuubi"
- "kyuubi-server/**/*"
- "kyuubi-server/src/**/*"
- "kyuubi-server/pom.xml"
- "extension/server/kyuubi-server-plugin/**/*"

"module:spark":
Expand All @@ -122,3 +122,6 @@

"module:authz":
- "extensions/spark/kyuubi-spark-authz/**/*"

"module:ui":
- "kyuubi-server/web-ui/**/*"
23 changes: 20 additions & 3 deletions .github/workflows/dep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ on:
- master
- branch-*
paths:
# dependency check happens only pom changes
# when pom or dependency workflow changes
- '**/pom.xml'
- '.github/workflows/dep.yml'
- .github/actions/setup-mvnd/*.yaml

concurrency:
group: dep-${{ github.ref }}
group: dep-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
Expand All @@ -43,11 +45,22 @@ jobs:
java-version: 8
cache: 'maven'
check-latest: false
- name: Setup Maven and Mvnd
uses: ./.github/actions/setup-mvnd
- name: Check kyuubi modules available
id: modules-check
run: >-
build/mvnd dependency:resolve validate -q
-DincludeGroupIds="org.apache.kyuubi" -DincludeScope="compile"
-Pfast -Denforcer.skip=false
-pl kyuubi-ctl,kyuubi-server,kyuubi-assembly -am
continue-on-error: true
- name: build
env:
MAVEN_OPTS: -Dorg.slf4j.simpleLogger.defaultLogLevel=error
if: steps.modules-check.conclusion == 'success' && steps.modules-check.outcome == 'failure'
run: >-
build/mvn clean install
build/mvnd clean install
-Pflink-provided,spark-provided,hive-provided
-Dmaven.javadoc.skip=true
-Drat.skip=true
Expand All @@ -57,3 +70,7 @@ jobs:
-pl kyuubi-ctl,kyuubi-server,kyuubi-assembly -am
- name: Check dependency list
run: build/dependency.sh
- name: Dependency Review
uses: actions/dependency-review-action@v3
with:
fail-on-severity: moderate
48 changes: 48 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#
# 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.
#

name: Docs

on:
pull_request:
branches:
- master

concurrency:
group: docs-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
sphinx:
name: sphinx-build
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.9'
cache: 'pip'
cache-dependency-path: docs/requirements.txt
- run: pip install -r docs/requirements.txt
- name: make html
run: make -d --directory docs html
- name: upload html
uses: actions/upload-artifact@v3
with:
path: |
docs/_build/html/
!docs/_build/html/_sources/
2 changes: 1 addition & 1 deletion .github/workflows/greetings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on: issues

jobs:
greeting:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
issues: write
pull-requests: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ permissions:

jobs:
triage:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/labeler@v4
with:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/license.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
- branch-*

concurrency:
group: lincense-${{ github.ref }}
group: license-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
Expand All @@ -42,8 +42,10 @@ jobs:
java-version: 8
cache: 'maven'
check-latest: false
- name: Setup Maven and Mvnd
uses: ./.github/actions/setup-mvnd
- run: >-
build/mvn org.apache.rat:apache-rat-plugin:check
build/mvnd org.apache.rat:apache-rat-plugin:check
-Ptpcds -Pspark-block-cleaner -Pkubernetes-it
-Pspark-3.1 -Pspark-3.2 -Pspark-3.3
- name: Upload rat report
Expand Down
Loading

0 comments on commit 16237c2

Please sign in to comment.