Skip to content

Commit

Permalink
Merge pull request #1097 from data-for-change/dev
Browse files Browse the repository at this point in the history
merge dev into master
  • Loading branch information
atalyaalon authored May 4, 2024
2 parents e809103 + 5b179de commit 82fbfb2
Show file tree
Hide file tree
Showing 10 changed files with 28,187 additions and 46,448 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [22.x]

steps:
- uses: actions/checkout@v2
Expand All @@ -21,6 +21,7 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npx update-browserslist-db@latest
- run: npm run build:staging --if-present
- run: npm run lint
# todo: add unit tests
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ jobs:
- name: Setup node
uses: actions/setup-node@master
with:
node-version: '16.x'
node-version: '22.x'
- name: Install Dependencies
run: npm install
- name: Update browserlist DB
run: npx update-browserslist-db@latest
- name: Build
run: npm run build:staging
- name: Deploy
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/deploy-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ jobs:
- name: Setup node
uses: actions/setup-node@master
with:
node-version: '16.x'
node-version: '22.x'
- name: Install Dependencies
run: npm install
- name: Update browserlist DB
run: npx update-browserslist-db@latest
- name: Build
run: npm run build
- name: Deploy
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:13.12.0-alpine
FROM node:22.0.0-alpine

WORKDIR /app/front/

Expand All @@ -11,7 +11,7 @@ COPY . ./
#expose the app port
EXPOSE 3000


RUN npx update-browserslist-db@latest
#start app
RUN npx browserslist@latest --update-db
CMD ["npm","start"]
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.prod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# create production build artifactss
FROM node:13.12.0-alpine as build
FROM node:22.0.0-alpine as build
WORKDIR /app/prod/
ENV PATH /app/node_modules/.bin:$PATH

Expand Down
Loading

0 comments on commit 82fbfb2

Please sign in to comment.