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.

Sign up for GitHub

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

[TECH] Aligner les montées de versions npm / node sur le mono repo (PIX-6533) #5371

Merged
merged 5 commits into from
Dec 16, 2022
Merged

[TECH] Aligner les montées de versions npm / node sur le mono repo (PIX-6533) #5371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6d8178
chore: align npm engine between all app
xav-car Dec 13, 2022
f7bf4a2
chore: update @1024pix/pix-ui to support [email protected]
yannbertrand Dec 16, 2022
ea95e58
chore: update .nvmrcs to lax node@v16
yannbertrand Dec 16, 2022
1e4ba85
chore: update dockerfiles to use [email protected]
yannbertrand Dec 16, 2022
0b246a4
chore: do not check node/npm version during configuration
yannbertrand Dec 16, 2022
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
21 changes: 9 additions & 12 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ workflows:
jobs:
checkout:
docker:
- image: cimg/node:16.14.0
- image: cimg/node:16.18.1
resource_class: small
working_directory: ~/pix
steps:
Expand All @@ -91,7 +91,7 @@ jobs:

api_build_and_test:
docker:
- image: cimg/node:16.14.0
- image: cimg/node:16.18.1
- image: postgres:13.7-alpine
environment:
POSTGRES_USER: circleci
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:

mon_pix_build_and_test:
docker:
- image: cimg/node:16.14.0-browsers
- image: cimg/node:16.18.1-browsers
environment:
# See https://git.io/vdao3 for details.
JOBS: 2
Expand Down Expand Up @@ -159,13 +159,12 @@ jobs:

orga_build_and_test:
docker:
- image: cimg/node:16.14.0-browsers
- image: cimg/node:16.18.1-browsers
environment:
JOBS: 2
resource_class: small
working_directory: ~/pix/orga
steps:
- run: sudo npm i -g [email protected]
- browser-tools/install-chrome
- attach_workspace:
at: ~/pix
Expand All @@ -188,7 +187,7 @@ jobs:

certif_build_and_test:
docker:
- image: cimg/node:16.14.0-browsers
- image: cimg/node:16.18.1-browsers
environment:
JOBS: 2
resource_class: small
Expand Down Expand Up @@ -216,7 +215,7 @@ jobs:

admin_build_and_test:
docker:
- image: cimg/node:16.14.0-browsers
- image: cimg/node:16.18.1-browsers
environment:
JOBS: 2
resource_class: small
Expand Down Expand Up @@ -244,7 +243,7 @@ jobs:

e2e_test:
docker:
- image: cimg/node:16.14.0-browsers
- image: cimg/node:16.18.1-browsers
- image: postgres:13.7-alpine
environment:
POSTGRES_USER: circleci
Expand Down Expand Up @@ -306,9 +305,7 @@ jobs:
environment:
JOBS: 2
working_directory: ~/pix/orga
command: |
sudo npm i -g [email protected]
npm ci
command: npm ci
- run:
name: Start Pix API
working_directory: ~/pix/api
Expand Down Expand Up @@ -345,7 +342,7 @@ jobs:

algo_test:
docker:
- image: cimg/node:16.14.0
- image: cimg/node:16.18.1
resource_class: small
parallelism: 1
working_directory: ~/pix/high-level-tests/test-algo
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.14.0
16
2 changes: 1 addition & 1 deletion admin/.nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.14.0
16
22 changes: 11 additions & 11 deletions admin/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions admin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"license": "AGPL-3.0",
"author": "GIP Pix",
"engines": {
"node": "16.14.0",
"npm": ">=8.3.1 <=8.13.2"
"node": "16",
"npm": ">=8.13.2 <9"
},
"ember": {
"edition": "octane"
Expand Down Expand Up @@ -39,7 +39,7 @@
},
"devDependencies": {
"@1024pix/ember-testing-library": "^0.5.0",
"@1024pix/pix-ui": "^20.2.3",
"@1024pix/pix-ui": "^20.2.4",
"@babel/eslint-parser": "^7.19.1",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.8.1",
Expand Down
2 changes: 1 addition & 1 deletion api/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"author": "GIP Pix",
"engines": {
"node": "16",
"npm": "8"
"npm": ">=8.13.2 <9"
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion certif/.nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.14.0
16
22 changes: 11 additions & 11 deletions certif/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions certif/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"license": "AGPL-3.0",
"author": "GIP Pix",
"engines": {
"node": "16.14.0",
"npm": ">=8.3.1 <=8.13.2"
"node": "16",
"npm": ">=8.13.2 <9"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -39,7 +39,7 @@
},
"devDependencies": {
"@1024pix/ember-testing-library": "^0.5.0",
"@1024pix/pix-ui": "^20.2.3",
"@1024pix/pix-ui": "^20.2.4",
"@babel/eslint-parser": "^7.19.1",
"@babel/plugin-proposal-decorators": "^7.20.5",
"@ember/optional-features": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions docker/dockerfiles/Dockerfile.ember
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM node:16.14.0 as dev
FROM node:16.18.1 as dev

WORKDIR /code
COPY . .
COPY . .

RUN npm ci

Expand Down
4 changes: 2 additions & 2 deletions docker/dockerfiles/Dockerfile.hapi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM node:16.14.0 as dev
FROM node:16.18.1 as dev

WORKDIR /code
EXPOSE 3000

COPY . .
COPY . .

RUN npm ci

Expand Down
2 changes: 1 addition & 1 deletion high-level-tests/e2e/.nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.14.0
16
2 changes: 1 addition & 1 deletion high-level-tests/e2e/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion high-level-tests/e2e/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"author": "GIP Pix",
"engines": {
"node": "16",
"npm": "8"
"npm": ">=8.13.2 <9"
},
"license": "AGPL-3.0",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion high-level-tests/load-testing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"author": "GIP Pix",
"engines": {
"node": "16",
"npm": "8"
"npm": ">=8.13.2 <9"
},
"license": "ISC",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion high-level-tests/test-algo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "index.js",
"engines": {
"node": "16",
"npm": "8"
"npm": ">=8.13.2 <9"
},
"scripts": {
"start": "node index.js",
Expand Down
2 changes: 1 addition & 1 deletion mon-pix/.nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.14.0
16
22 changes: 11 additions & 11 deletions mon-pix/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading