Skip to content

Commit

Permalink
replace master with main branch & license fix (#318)
Browse files Browse the repository at this point in the history
* replace master with main branch & licence fix

* Fix License image link
  • Loading branch information
mzitnik authored Jun 21, 2024
1 parent 0c1dec7 commit d458009
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ on:
branches:
- "master"
- "branch-*"
- "main"
pull_request:
branches:
- "master"
- "branch-*"
- "main"

jobs:
run-tests:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/check-license.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ on:
branches:
- "master"
- "branch-*"
- "main"
pull_request:
branches:
- "master"
- "branch-*"
- "main"

jobs:
check-license:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
push:
branches:
- "master"
- "main"
paths:
- "docs/**"
- "mkdocs.yml"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
matrix:
branch:
- "master"
- "main"
scala: [ 2.12, 2.13 ]
spark: [ 3.3, 3.4, 3.5 ]
steps:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ on:
branches:
- "master"
- "branch-*"
- "main"
pull_request:
branches:
- "master"
- "branch-*"
- "main"

jobs:
check-style:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tpcds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ on:
branches:
- "master"
- "branch-*"
- "main"
pull_request:
branches:
- "master"
- "branch-*"
- "main"

jobs:
run-tpcds-sf1:
Expand Down
4 changes: 3 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Copyright 2016-2024 ClickHouse, Inc.

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -186,7 +188,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright 2016-2024 ClickHouse, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Spark ClickHouse Connector
===
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.housepower/clickhouse-spark-runtime-3.3_2.12/badge.svg)](https://search.maven.org/search?q=clickhouse-spark-runtime)
[![License](https://img.shields.io/github/license/housepower/spark-clickhouse-connector)](https://github.com/housepower/spark-clickhouse-connector/blob/master/LICENSE)
[![License](https://img.shields.io/github/license/clickhouse/spark-clickhouse-connector)](https://github.com/ClickHouse/spark-clickhouse-connector/blob/main/LICENSE)

Build on Apache Spark DataSourceV2 API.

Expand Down Expand Up @@ -29,7 +29,7 @@ Notes:

| Version | Compatible Spark Versions | ClickHouse JDBC version |
|---------|---------------------------|-------------------------|
| master | Spark 3.3, 3.4, 3.5 | 0.6.0 |
| main | Spark 3.3, 3.4, 3.5 | 0.6.0 |
| 0.7.3 | Spark 3.3, 3.4 | 0.4.6 |
| 0.6.0 | Spark 3.3 | 0.3.2-patch11 |
| 0.5.0 | Spark 3.2, 3.3 | 0.3.2-patch11 |
Expand Down
2 changes: 1 addition & 1 deletion docs/developers/01_build_and_test.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Build and Test
Check out source code from GitHub

```
git checkout https://github.com/housepower/spark-clickhouse-connector.git
git checkout https://github.com/ClickHouse/spark-clickhouse-connector.git
```

Build w/o test
Expand Down
10 changes: 5 additions & 5 deletions docs/developers/04_public_release.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@ Public Release

## Snapshot Release

The daily snapshot release is managed by [Publish Snapshot](https://github.com/housepower/spark-clickhouse-connector/blob/master/.github/workflows/publish-snapshot.yml)
The daily snapshot release is managed by [Publish Snapshot](https://github.com/ClickHouse/spark-clickhouse-connector/blob/main/.github/workflows/publish-snapshot.yml)
workflow, it is scheduled to be deployed at midnight every day.


## Feature Release

1. Cut new branch from master branch, e.g. `branch-0.3`;
1. Cut new branch from main branch, e.g. `branch-0.3`;
2. Update version in `version.txt` and `docker/.env-dev`, e.g. from `0.3.0-SNAPSHOT` to `0.3.0`;
3. Create new tag, e.g. `v0.3.0`, it will trigger the [Publish Release](https://github.com/housepower/spark-clickhouse-connector/blob/master/.github/workflows/publish-release.yml)
3. Create new tag, e.g. `v0.3.0`, it will trigger the [Publish Release](https://github.com/ClickHouse/spark-clickhouse-connector/blob/main/.github/workflows/publish-release.yml)
workflow;
4. Verify, close, and release in [Sonatype Repository](https://oss.sonatype.org/#stagingRepositories)
5. Announce in [GitHub Release](https://github.com/housepower/spark-clickhouse-connector/releases)
6. Update version in `version.txt` and `docker/.env-dev`, e.g. from `0.3.0` to `0.3.1-SNAPSHOT`;
7. Update version on master branch in `version.txt` and `docker/.env-dev`, e.g. from `0.3.0-SNAPSHOT` to `0.4.0-SNAPSHOT`;
8. [Publish Docker image](https://github.com/housepower/spark-clickhouse-connector/tree/master/docker) after jars
7. Update version on main branch in `version.txt` and `docker/.env-dev`, e.g. from `0.3.0-SNAPSHOT` to `0.4.0-SNAPSHOT`;
8. [Publish Docker image](https://github.com/ClickHouse/spark-clickhouse-connector/tree/main/docker) after jars
available in Maven Central, generally it costs few minutes after step 3.

## Patch Release
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ For old versions, please refer the compatible matrix.

| Version | Compatible Spark Versions | ClickHouse JDBC version |
|---------|---------------------------|-------------------------|
| master | Spark 3.3, 3.4, 3.5 | 0.6.0 |
| main | Spark 3.3, 3.4, 3.5 | 0.6.0 |
| 0.7.3 | Spark 3.3, 3.4 | 0.4.6 |
| 0.6.0 | Spark 3.3 | 0.3.2-patch11 |
| 0.5.0 | Spark 3.2, 3.3 | 0.3.2-patch11 |
Expand Down

0 comments on commit d458009

Please sign in to comment.