Merged
Conversation
…pendencies feat: Adjusting Docker related files to expose debugger port chore: Created run configuration support files to run Docker and attach debugger
* rc-1.1.0: exporting websocket config including env var changes to system config adding todo fixing typo adjusting configs to match new format, fixing calls which reference config fix EVSEType value # Conflicts: # Server/src/config/envs/docker.ts # Server/src/config/envs/local.ts # Server/src/index.ts # Swarm/src/config/envs/local.ts # Swarm/src/index.ts
…emoving src directory
* rc-1.1.0: (55 commits) adding interfaces for locations repo, exporting interface adding locations repository impl added missing relation (Locations have one or more Charging Stations; Stations have at most one Location) expanded authenticator to handle unknown/known chargers and duplicate charger connections; system config also expanded to accomodate accept unknown chargers adding Location and ChargingStation entities adding ocpp router to unix install scripts, updating comments to refer to ocpp router instead of central system Update Server/src/index.ts fix: Upgrade setup build action due to deprication notice fix: PR sanity build job with correct path fix: add in no cache to avoid npm issues with the tarballs adding admin api to swarm adjusting swarm for new class structure Removing INetworkConnection, combining IMessageRouter and ICentralSystem fix: only trigger for a version tag push and set higher version of builder image to move up from node16 which is deprecated in github Update Swarm/src/index.ts improved comment improved logging and variable management in directus hook pr feedback--better comment, removing problematic defaults for directus username/password feature: add a workflow that runs a build without pushing when a PR is opened feature: add a workflow that builds and pushes the server docker image to Github container registry when a commit is tagged with `v*` ... # Conflicts: # .gitignore # 00_Base/src/index.ts # 00_Base/src/interfaces/messages/index.ts # 02_Util/package.json # 02_Util/src/queue/google-pubsub/receiver.ts # 02_Util/src/queue/kafka/receiver.ts # 02_Util/src/queue/rabbit-mq/receiver.ts # 02_Util/src/server/example/router.ts # 02_Util/src/server/example/server.ts # 03_Modules/Configuration/src/module/api.ts # 03_Modules/EVDriver/src/module/module.ts # 03_Modules/Reporting/src/module/module.ts # Server/docker-compose.yml # Server/docker/Dockerfile # Server/package.json # Server/src/config/envs/local.ts # Server/src/index.ts # Server/unix-init-install-all.sh # Swarm/docker/Dockerfile # Swarm/package.json # Swarm/src/config/envs/local.ts # Swarm/src/index.ts # Swarm/unix-init-install-all.sh
Collaborator
ChrisWeissmann
left a comment
ChrisWeissmann
left a comment
There was a problem hiding this comment.
The test build in the GitHub workflow seems broken now. We should probably fix this.
thanaParis
requested changes
Apr 2, 2024
Collaborator
thanaParis
left a comment
thanaParis
left a comment
There was a problem hiding this comment.
This PR is doing too much at the moment. I'd appreciate if we could focus on what's needed to move towards an npm workspace, and remove references to IntelliJ as we previously discussed. The tsconfig inheritance changes can stay--I think they're related enough.
elliot-sabitov
force-pushed
the
feature/workspaces
branch
from
acbd51c to
e0a21d4
Compare
elliot-sabitov
commented
Apr 3, 2024
thanaParis
approved these changes
Apr 4, 2024
Signed-off-by: thanaParis <thana.paris@s44.team>
Signed-off-by: thanaParis <thana.paris@s44.team>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
feat: Utilizing npm workspaces to simplify multi npm package local dependencies
feat: Adjusting Docker related files to expose debugger port
chore: Created run configuration support files to run Docker and attach debugger