Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade engine #616

Merged
merged 4 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
schedule:
# Available options: daily, weekly or monthly
interval: "daily"
# Has to be formatted as hh:mm
time: "06:06"
# List of time zones: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
timezone: "Europe/Paris"
# Allow updates for Open Terms Archive engine
allow:
- dependency-name: "@opentermsarchive/engine"
# Open Terms Archive recommends to always add the collection maintainer team as a reviewer so they are notified of the update
reviewers:
- "OpenTermsArchive/france"
# Avoid having too many open pull requests
open-pull-requests-limit: 1
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Get target server hostname
id: get_hostname
uses: mikefarah/yq@master
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,32 @@ jobs:
validate_schema:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- run: npm install
- run: npm run test:schema

lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- run: npm install
- run: npm run lint

validate_modified_declarations:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0 # fetch all history for all branches and tags
- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- run: npm install
- run: npm run test:modified
- name: Generate artifacts
Expand Down
24 changes: 15 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
# Open Terms Archive - French services
# Declarations of terms tracked in the *France* collection

These services declarations are maintained by [UFC-Que Choisir](https://www.quechoisir.org) with support from the [Office of the French Ambassador for Digital Affairs](https://www.diplomatie.gouv.fr/fr/politique-etrangere-de-la-france/diplomatie-numerique/) and tracked on [Open Terms Archive](https://opentermsarchive.org).

The terms listed in this collection are tracked by the [Open Terms Archive engine](https://github.com/OpenTermsArchive/engine).
The terms in this collection were initially declared by [UFC-Que Choisir](https://www.quechoisir.org) with support from the [Office of the French Ambassador for Digital Affairs](https://www.diplomatie.gouv.fr/fr/politique-etrangere-de-la-france/diplomatie-numerique/), and are now maintained by volunteer contributors. They are tracked using [Open Terms Archive](https://opentermsarchive.org).

You can [explore the tracked versions](https://github.com/OpenTermsArchive/france-versions) interactively or [download them as a dataset](https://github.com/OpenTermsArchive/france-versions/releases) in the `OpenTermsArchive/france-versions` repository.

- - -

## Scope

The terms tracked by this repository are those of services that operate:

- In the French jurisdiction.
- In French, unless no French version exists, in which case English will be used; if there is no English version either, then the primary official language of the jurisdiction of incorporation of the service operator will be used.
The terms you will find in this collection match the following scope:

- **Topic:** largest French online B2C services.
- **Jurisdictions:** France
- **Languages:** French, unless no French version exists, in which case English will be used; if there is no English version either, then the primary official language of the jurisdiction of incorporation of the service operator will be used.

- - -

## Contribute

In order to contribute additional terms to this collection or correct existing ones, please read the guidelines on [targeting](https://docs.opentermsarchive.org/guidelines/targeting/) and [declaring](https://docs.opentermsarchive.org/guidelines/declaring/) terms.
In order to contribute additional terms to this collection or correct existing ones, please read the [documentation](https://docs.opentermsarchive.org/contributing-terms/).

- - -

Expand All @@ -30,6 +28,14 @@ Interacting with this collection can also be done over the command line. Read th

- - -

## Suggested engine updates

In order to keep the Open Terms Archive engine up-to-date, updates will be automatically suggested by [Dependabot](https://github.blog/2020-06-01-keep-all-your-packages-up-to-date-with-dependabot/) in a pull request when a new version is available.

While engine updates follow the [semantic versioning](https://semver.org) standard and automated collection tests should provide a safety net, it is ultimately the responsibility of the maintainers of the collection to check version compatibility and potentially adjust the declarations before applying these updates.

- - -

## License

The code in this repository is distributed under the GNU Affero General Public Licence (AGPL) v3.0.
2 changes: 1 addition & 1 deletion deployment/requirements.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
collections:
- name: opentermsarchive.deployment
version: 0.0.11
version: 0.0.14
Loading