Skip to content

Commit 271ce1e

Browse files
chore: backport workflows / update license
Signed-off-by: Henry Gressmann <[email protected]>
1 parent cd19702 commit 271ce1e

File tree

8 files changed

+202
-673
lines changed

8 files changed

+202
-673
lines changed

.github/.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
**/bun.lock linguist-generated=true

.github/CONTRIBUTING.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
# Licensing
22

3-
Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in Liwan by you, as defined in the Apache-2.0 license, shall be licensed under the terms of both the [Apache License, Version 2.0](https://opensource.org/license/apache-2-0) and the [MIT license](https://opensource.org/license/mit) without any additional terms or conditions. This dual licensing is intended to allow possible future re-licensing under a more permissive license and monitization of the project. If you do not agree with this dual licensing, you should not contribute to the project (which is fine! you can still use and modify it under the terms of the AGPLv3).
4-
5-
Please add your name to the list of contributors at the end of this file if you make a significant contribution to the project to confirm that you agree to the dual licensing. This is a requirement for your contribution to be accepted.
6-
7-
# Contributors
8-
9-
The code contributed by the following people is dual-licensed under the terms of the [Apache License, Version 2.0](https://opensource.org/license/apache-2-0) and the [MIT license](https://opensource.org/license/mit):
3+
Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in Liwan by you, as defined in the Apache-2.0 license, shall be licensed under the terms of the [Apache License, Version 2.0](https://opensource.org/license/apache-2-0) without any additional terms or conditions.

.github/workflows/container.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- uses: actions/checkout@v4
25-
with:
26-
ref: ${{ inputs.tag }}
27-
persist-credentials: false
2825
- name: Setup Docker Buildx
2926
uses: docker/setup-buildx-action@v3
3027
- name: Extract Semver

.github/workflows/release.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v4
1515
with:
1616
persist-credentials: false
17-
- uses: taiki-e/create-gh-release-action@v1.8.2
17+
- uses: taiki-e/create-gh-release-action@v1.9.1
1818
with:
1919
changelog: CHANGELOG.md
2020
allow-missing-changelog: true
@@ -68,7 +68,8 @@ jobs:
6868
with:
6969
name: web-dist
7070
path: ./web/dist
71-
- uses: taiki-e/[email protected]
71+
- uses: actions-rust-lang/[email protected]
72+
- uses: taiki-e/[email protected]
7273
with:
7374
bin: liwan
7475
target: ${{ matrix.target }}

Cargo.lock

Lines changed: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LICENSE.md

Lines changed: 185 additions & 642 deletions
Large diffs are not rendered by default.

NOTICE.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
- `data/ua_regexes.yaml` is based on data from [ua-parser/uap-core](https://github.com/ua-parser/uap-core/blob/master/regexes.yaml) (Copyright 2009 Google Inc. and available under the Apache License, Version 2.0)
2+
- `data/spammers.txt` is in the public domain (see [matomo-org/referrer-spam-list](https://github.com/matomo-org/referrer-spam-list))
3+
- `data/socials.txt` is based on [matomo-org/searchengine-and-social-list](https://github.com/matomo-org/searchengine-and-social-list) (available under the CC0 1.0 Universal Public Domain Dedication)
4+
- `data/geo.json` is based on data from [Natural Earth](https://naturalearthdata.com/) (which itself is in the public domain)
5+
- See [CONTRIBUTING](.github/CONTRIBUTING.md) for more information on licensing of contributions from external contributors.

README.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,4 @@
3737

3838
## License
3939

40-
Unless otherwise noted, the code in this repository is available under the terms of the GNU AGPLv3 license. See [LICENSE](LICENSE.md) for more information.
41-
The tracking client (contained in `tracker/`) is available as a separate library under the terms of the MIT license (see [LICENSE](tracker/LICENSE.md)) to allow for easier integration into other projects without the possibility of AGPLv3 contamination.
42-
43-
For commercial licensing options, contact [[email protected]](mailto:[email protected]).
44-
45-
### Third-party licenses
46-
47-
- `data/ua_regexes.yaml` is based on data from [ua-parser/uap-core](https://github.com/ua-parser/uap-core/blob/master/regexes.yaml) (Copyright 2009 Google Inc. and available under the Apache License, Version 2.0)
48-
- `data/spammers.txt` is in the public domain (see [matomo-org/referrer-spam-list](https://github.com/matomo-org/referrer-spam-list))
49-
- `data/socials.txt` is based on [matomo-org/searchengine-and-social-list](https://github.com/matomo-org/searchengine-and-social-list) (available under the CC0 1.0 Universal Public Domain Dedication)
50-
- `data/geo.json` is based on data from [Natural Earth](https://naturalearthdata.com/) (which itself is in the public domain)
51-
- See [CONTRIBUTING](.github/CONTRIBUTING.md) for more information on licensing of contributions from external contributors.
40+
Unless otherwise noted, the code in this repository is available under the terms of the Apache-2.0 license. See [LICENSE](LICENSE.md) for more information.

0 commit comments

Comments
 (0)