diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml index 9131425f79..5603c5ffa2 100644 --- a/.github/workflows/compatibility.yml +++ b/.github/workflows/compatibility.yml @@ -2,7 +2,7 @@ name: compatibility on: push: branches: - - 'compatibility' + - "compatibility" jobs: python-test: @@ -11,11 +11,11 @@ jobs: max-parallel: 9 matrix: os: [windows-latest, ubuntu-20.04, macOS-latest] - python-version: [ 3.8 ] + python-version: [3.8] steps: - name: Checkout github repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Python uses: actions/setup-python@v1 with: @@ -33,13 +33,13 @@ jobs: strategy: max-parallel: 9 matrix: - os: [ windows-latest, ubuntu-20.04, macOS-latest ] - node-version: [ 10.x, 14.x ] + os: [windows-latest, ubuntu-20.04, macOS-latest] + node-version: [18.16.1] steps: - name: Checkout github repo - uses: actions/checkout@v1 + uses: actions/checkout@v3 - name: Set up Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - name: Install dependencies @@ -48,7 +48,3 @@ jobs: - name: Build run: npm run build working-directory: webapp -# - name: Run tests -# run: npm run test -# working-directory: webapp - diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1f6c257045..c05f960674 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,8 +3,8 @@ name: deploy on: push: branches: - - 'master' - - 'hotfix/**' + - "master" + - "hotfix/**" jobs: binary: @@ -12,7 +12,7 @@ jobs: strategy: max-parallel: 3 matrix: - os: [ windows-latest, ubuntu-20.04 ] + os: [windows-latest, ubuntu-20.04] steps: - name: 🐙 Checkout GitHub repo (+ download lfs dependencies) @@ -27,7 +27,7 @@ jobs: - name: 💚 Set up Node.js uses: actions/setup-node@v3 with: - node-version: '14.x' + node-version: 18.16.1 - name: 💚 Install dependencies run: npm install diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d0f8c4c7ac..71f5b47819 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,14 +2,14 @@ name: main on: push: branches: - - '**' + - "**" jobs: python-lint: runs-on: ubuntu-20.04 steps: - name: Checkout github repo (+ download lfs dependencies) - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Python uses: actions/setup-python@v1 with: @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout github repo (+ download lfs dependencies) - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Python uses: actions/setup-python@v1 with: @@ -65,14 +65,14 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-20.04 ] + os: [ubuntu-20.04] steps: - name: Checkout github repo - uses: actions/checkout@v1 + uses: actions/checkout@v3 - name: Set up Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: - node-version: 14.x + node-version: 18.16.1 - name: Install dependencies run: npm install working-directory: webapp @@ -100,18 +100,18 @@ jobs: runs-on: ubuntu-20.04 needs: [python-test, npm-test] steps: - - uses: actions/checkout@v2 - - name: Download python coverage report - uses: actions/download-artifact@v3 - with: - name: python-code-coverage-report - - name: Download js coverage report - uses: actions/download-artifact@v3 - with: - name: js-code-coverage-report - path: webapp/coverage - - name: SonarCloud Scan - uses: sonarsource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + - uses: actions/checkout@v3 + - name: Download python coverage report + uses: actions/download-artifact@v3 + with: + name: python-code-coverage-report + - name: Download js coverage report + uses: actions/download-artifact@v3 + with: + name: js-code-coverage-report + path: webapp/coverage + - name: SonarCloud Scan + uses: sonarsource/sonarcloud-github-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/docs/install/0-INSTALL.md b/docs/install/0-INSTALL.md index a51c624450..167afb39aa 100644 --- a/docs/install/0-INSTALL.md +++ b/docs/install/0-INSTALL.md @@ -7,7 +7,7 @@ The front end is a [React](https://reactjs.org/) web application. A local build Requirements : - python : 3.8.x -- node : 14.x +- node : 18.16.1 1. First clone the projet: diff --git a/webapp/package.json b/webapp/package.json index 313f841d3b..dc8da4732f 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -3,7 +3,7 @@ "version": "2.14.4", "private": true, "engines": { - "node": "18.12.0" + "node": "18.16.1" }, "dependencies": { "@emotion/react": "11.10.6", diff --git a/webapp/public/locales/en/main.json b/webapp/public/locales/en/main.json index dedbf273de..5e5d65edbd 100644 --- a/webapp/public/locales/en/main.json +++ b/webapp/public/locales/en/main.json @@ -75,8 +75,6 @@ "global.error.failedtoretrievelogs": "Failed to retrieve job logs", "global.error.failedtoretrievedownloads": "Failed to retrieve downloads list", "global.area.add": "Add an area", - "global.compare": "Compare", - "global.selected": "Selected", "login.error": "Failed to authenticate", "tasks.title": "Tasks", "api.title": "API", diff --git a/webapp/public/locales/fr/main.json b/webapp/public/locales/fr/main.json index eb84337b69..314d3c9b03 100644 --- a/webapp/public/locales/fr/main.json +++ b/webapp/public/locales/fr/main.json @@ -75,8 +75,6 @@ "global.error.failedtoretrievelogs": "Échec de la récupération des logs", "global.error.failedtoretrievedownloads": "Échec de la récupération des exports", "global.area.add": "Ajouter une zone", - "global.compare": "Comparer", - "global.selected": "Sélectionné", "login.error": "Échec de l'authentification", "tasks.title": "Tâches", "api.title": "API",