Skip to content

Commit 44a0444

Browse files
committed
Merge branch 'main' into additives
2 parents 0d0f0d8 + 6a1c019 commit 44a0444

989 files changed

Lines changed: 474329 additions & 136435 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ WEB_RESOURCES_PATH=./web-default
2828
PRODUCERS_PLATFORM=0
2929
PRODUCT_OPENER_DOMAIN=openfoodfacts.localhost
3030
PRODUCT_OPENER_PORT=80
31+
PRODUCT_OPENER_HOST_PORT=80
3132
PRODUCT_OPENER_FLAVOR=openfoodfacts
3233
PRODUCT_OPENER_FLAVOR_SHORT=off
3334

.github/workflows/api-linting.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@v6
24+
uses: actions/checkout@v7
2525

2626
- name: Setup Node.js
27-
uses: actions/setup-node@v6
27+
uses: actions/setup-node@v7
2828
with:
2929
node-version: '22'
3030

.github/workflows/auto-assign-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
name: 'Pull request assignment'
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: toshimaru/auto-author-assign@v3.0.2
20+
- uses: toshimaru/auto-author-assign@v3.0.3

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,23 @@ jobs:
4444

4545
steps:
4646
- name: Checkout repository
47-
uses: actions/checkout@v6
47+
uses: actions/checkout@v7
4848
with:
4949
# We must fetch at least the immediate parents so that if this is
5050
# a pull request then we can checkout the head.
5151
fetch-depth: 2
5252

5353
# Initializes the CodeQL tools for scanning.
5454
- name: Initialize CodeQL
55-
uses: github/codeql-action/init@v4
55+
uses: github/codeql-action/init@v4.37.3
5656
# Override language selection by uncommenting this and choosing your languages
5757
# with:
5858
# languages: go, javascript, csharp, python, cpp, java
5959

6060
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6161
# If this step fails, then you should remove it and run the build manually (see below).
6262
- name: Autobuild
63-
uses: github/codeql-action/autobuild@v4
63+
uses: github/codeql-action/autobuild@v4.37.3
6464

6565
# ℹ️ Command-line programs to run using the OS shell.
6666
# 📚 https://git.io/JvXDl
@@ -74,4 +74,4 @@ jobs:
7474
# make release
7575

7676
- name: Perform CodeQL Analysis
77-
uses: github/codeql-action/analyze@v4
77+
uses: github/codeql-action/analyze@v4.37.3

.github/workflows/container-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
"backend"
2828
]
2929
steps:
30-
- uses: actions/checkout@v6
30+
- uses: actions/checkout@v7
3131
with:
3232
fetch-depth: 1
3333

@@ -91,7 +91,7 @@ jobs:
9191
skip-dirs: opt/product-opener/build-cache/,opt/product-opener/taxonomies
9292
trivy-config: trivy.yaml
9393
- name: Upload Trivy results to GitHub Security
94-
uses: github/codeql-action/upload-sarif@v4
94+
uses: github/codeql-action/upload-sarif@v4.37.3
9595
if: always()
9696
with:
9797
sarif_file: ${{ matrix.image_name }}-trivy.sarif

.github/workflows/container-deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ jobs:
173173
echo "GOOGLE_CLOUD_VISION_API_KEY=${{ secrets.GOOGLE_CLOUD_VISION_API_KEY }}" >> .env
174174
echo "CROWDIN_PROJECT_IDENTIFIER=${{ env.CROWDIN_PROJECT_IDENTIFIER }}" >> .env
175175
echo "CROWDIN_PROJECT_KEY=${{ secrets.CROWDIN_PROJECT_KEY }}" >> .env
176+
echo "ECOBALYSE_API_TOKEN=${{ secrets.ECOBALYSE_API_TOKEN }}" >> .env
176177
echo "GEOLITE2_PATH=${{ env.GEOLITE2_PATH }}" >> .env
177178
echo "GEOLITE2_LICENSE_KEY=${{ secrets.GEOLITE2_LICENSE_KEY }}" >> .env
178179
echo "GEOLITE2_ACCOUNT_ID=${{ secrets.GEOLITE2_ACCOUNT_ID }}" >> .env

.github/workflows/crowdin-per-language.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
lc: [ca, uk, it, es, fr, de, id, en, he, da, ko, nl, pt-BR, zh-TW, nl-BE, pt-PT, zh-HK, zh-CN, aa , ar , ber , br , co , fa , ga , hy , iu , kk , lb , me , mr , ne , no , ry , sd , sl , sq , st , tg , tr , tzl , val , wa , zea , zu , ach , as , bg , bs , crs , eo , fi , gd , hi , id , ja , km , ku , lo , mg , ms , nr , pa , qu , sa , sg , sma , sr , sv , th , ts , ug , ve , wo , zh ,af , ast , bm , ca , cs , el , fil , gl , hr , ii , jv , kmr , kw , mi , mt , pl , rm , sat , sh , sn , sr_CS , sw , ti , tt , uk , vec , xh , ak , az , bn , ce , cv , et , fo , gu , ht , is , ka , kmr_TR , ky , lt , ml , my , oc , ro , sc , si , so , sr_RS , ta , tl , tw , ur , vi , yi , am , be , bo , chr , cy , eu , ha , hu , kab , kn , la , lv , mn , nb , nn , ru , sco , sk , son , ss , te , tn , ty , uz , vls , yo ]
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v6
23+
uses: actions/checkout@v7
2424
- name: Matrix
25-
uses: crowdin/github-action@v2.16.2
25+
uses: crowdin/github-action@v2.17.0
2626
with:
2727
upload_translations: false # default is false
2828
download_translations: true

.github/workflows/crowdin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v6
14+
uses: actions/checkout@v7
1515
- name: crowdin action
16-
uses: crowdin/github-action@v2.16.2
16+
uses: crowdin/github-action@v2.17.0
1717
with:
1818
upload_translations: false # default is false
1919
# Use this option to upload translations for a single specified language

.github/workflows/generate-doc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout sources
22-
uses: actions/checkout@v6
22+
uses: actions/checkout@v7
2323
with:
2424
fetch-depth: 1
2525

.github/workflows/label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
pull-requests: write
2323

2424
steps:
25-
- uses: actions/labeler@v6
25+
- uses: actions/labeler@v7
2626
#if: github.event.pull_request.head.repo.full_name == github.repository
2727
with:
2828
repo-token: "${{ secrets.GITHUB_TOKEN }}"

0 commit comments

Comments
 (0)