Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:varun2948/tasking-manager into f…
Browse files Browse the repository at this point in the history
…ix-frontend-dependency-osm-download-issue
  • Loading branch information
varun2948 committed May 2, 2024
2 parents dc7f260 + 3e45ab3 commit 1f324ba
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 402 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
frontend-code-test:
resource_class: large
docker:
- image: cimg/node:16.20
- image: cimg/node:18.19.1
working_directory: /home/circleci/tasking-manager
steps:
- checkout
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
working_directory: /home/circleci/tasking-manager
resource_class: medium
docker:
- image: cimg/python:3.10.7-node
- image: cimg/node:18.19.1
steps:
- checkout
- aws-cli/setup:
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
working_directory: /home/circleci/tasking-manager
resource_class: large
docker:
- image: cimg/python:3.10.7-node
- image: cimg/node:18.19.1
parameters:
stack_name:
description: "the name of the stack for cfn-config"
Expand Down
322 changes: 0 additions & 322 deletions .github/dependabot.yml

This file was deleted.

2 changes: 1 addition & 1 deletion docs/developers/development-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ The client is the front-end user interface of the Tasking Manager. It is based o
#### Dependencies
The following dependencies must be available _globally_ on your system:
* Download and install [NodeJS LTS v12+](https://nodejs.org/en/) and [yarn](https://classic.yarnpkg.com/en/docs/install)
* Download and install [Node 18.xx](https://nodejs.org/en/download) and [yarn](https://classic.yarnpkg.com/en/docs/install)
* Go into the `frontend` directory and execute `yarn`.
#### Available Scripts
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,6 @@
]
},
"volta": {
"node": "16.20.0"
"node": "18.19.1"
}
}
Loading

0 comments on commit 1f324ba

Please sign in to comment.