diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml index 3a80d252b3..baf6b4ad1a 100644 --- a/.github/workflows/container-build.yml +++ b/.github/workflows/container-build.yml @@ -3,7 +3,7 @@ name: Container Image Build CI on: push: branches: - - master + - main - deploy-* tags: - v*.*.* diff --git a/.github/workflows/container-deploy.yml b/.github/workflows/container-deploy.yml index 0266efd735..ab12b784fa 100644 --- a/.github/workflows/container-deploy.yml +++ b/.github/workflows/container-deploy.yml @@ -3,7 +3,7 @@ name: Container Image Deployment CI on: push: branches: - - master + - main - deploy-* tags: - v*.*.* diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml index c87cd4dbf6..c709f66228 100644 --- a/.github/workflows/generate-docs.yml +++ b/.github/workflows/generate-docs.yml @@ -1,5 +1,5 @@ #---------------------------------------------- -# Generate and upload documentation (only on push to master) +# Generate and upload documentation (only on push to main) #---------------------------------------------- name: Generate documentation @@ -13,7 +13,7 @@ on: - "mkdocs.yml" push: branches: - - master + - main jobs: publish-docs: @@ -60,12 +60,12 @@ jobs: build -o /output/references/api/index.html api.yml && \ sudo chown $UID -R gh_pages - # Deploy docs to gh_pages if we are pushing to master + # Deploy docs to gh_pages if we are pushing to main # Example from https://github.com/marketplace/actions/deploy-to-github-pages - name: Deploy 🚀 - # we only deploy on push to master + # we only deploy on push to main if: | - github.event_name == 'push' && github.event.ref == 'refs/heads/master' + github.event_name == 'push' && github.event.ref == 'refs/heads/main' uses: JamesIves/github-pages-deploy-action@v4.4.1 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index aca4913392..86a5d9fdd6 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main name: release-please jobs: release-please: diff --git a/README.md b/README.md index e4674799ac..6e2e9cac33 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Robotoff ![Build Status](https://github.com/openfoodfacts/robotoff/workflows/Robotoff%20unit%20tests%20and%20deployments/badge.svg) -[![codecov](https://codecov.io/gh/openfoodfacts/robotoff/branch/master/graph/badge.svg?token=BY2T0KXNO1)](https://codecov.io/gh/openfoodfacts/robotoff) +[![codecov](https://codecov.io/gh/openfoodfacts/robotoff/branch/main/graph/badge.svg?token=BY2T0KXNO1)](https://codecov.io/gh/openfoodfacts/robotoff) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) ![GitHub language count](https://img.shields.io/github/languages/count/openfoodfacts/robotoff) ![GitHub top language](https://img.shields.io/github/languages/top/openfoodfacts/robotoff) diff --git a/doc/explanations/predictions.md b/doc/explanations/predictions.md index b079f824ee..760eb0e25d 100644 --- a/doc/explanations/predictions.md +++ b/doc/explanations/predictions.md @@ -2,7 +2,7 @@ Robotoff purpose is to generate predictions about Open Food Facts products from various sources: images, image OCRs, product meta data,... -A complete list of _predictions_ types can be found in [robotoff.prediction.types](https://github.com/openfoodfacts/robotoff/blob/master/robotoff/prediction/types.py). The most common ones are `brand`, `label`, `category`,... +A complete list of _predictions_ types can be found in [robotoff.prediction.types](https://github.com/openfoodfacts/robotoff/blob/main/robotoff/prediction/types.py). The most common ones are `brand`, `label`, `category`,... All _predictions_ are stored in the PostgreSQL database in the`prediction` table. diff --git a/doc/introduction/contributing.md b/doc/introduction/contributing.md index 195ab99963..301c09a731 100644 --- a/doc/introduction/contributing.md +++ b/doc/introduction/contributing.md @@ -26,7 +26,7 @@ Look through the Github issues for features. Anything tagged with "enhancement" ### Write Documentation -Robotoff could always use more documentation, whether as part of the official [Robotoff docs](https://github.com/openfoodfacts/robotoff/tree/master/doc) or in docstrings. +Robotoff could always use more documentation, whether as part of the official [Robotoff docs](https://github.com/openfoodfacts/robotoff/tree/main/doc) or in docstrings. ### Submit Feedback diff --git a/doc/references/api.yml b/doc/references/api.yml index fb9f34afd7..aeefe8440b 100644 --- a/doc/references/api.yml +++ b/doc/references/api.yml @@ -1402,4 +1402,4 @@ tags: An insight is a fact about a product that has been either extracted or inferred from the product pictures, characteristics,... If the insight is correct, the Openfoodfacts DB can be updated accordingly. - Current insight types and their description can be found in [robotoff/insights/dataclass.py](https://github.com/openfoodfacts/robotoff/blob/master/robotoff/insights/dataclass.py). + Current insight types and their description can be found in [robotoff/insights/dataclass.py](https://github.com/openfoodfacts/robotoff/blob/main/robotoff/insights/dataclass.py).