Skip to content

Commit

Permalink
reset to the known good commit *after* cloning
Browse files Browse the repository at this point in the history
This should fix
EVerest#47 (comment)

Testing done:

Made a change to copy the everest demo instead of cloning it.

```
$ bash demo-iso15118-2-ac-plus-ocpp.sh -r /.../everest-demo -3
/var/folders/y5/cx3cfzrd2q116myv9ly86sw1rnlmdj/T/tmp.4wcbFf1P/maeve-csms /var/folders/y5/cx3cfzrd2q116myv9ly86sw1rnlmdj/T/tmp.4wcbFf1P
HEAD is now at b990d0e fix: make lb depend on services in compose
...
Patching the CSMS to enable EVerest organization
patching file docker-compose.yml
Patching the CSMS to enable local mo root
patching file 'config/manager/config.toml'
Patching the CSMS to enable local mo root
patching file 'manager/handlers/ocpp201/authorize.go'
Starting the CSMS
```

Signed-off-by: Shankari <k.shankari@ee.doe.gov>
  • Loading branch information
shankari committed Jun 1, 2024
1 parent 6cad080 commit d021011
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions demo-iso15118-2-ac-plus-ocpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,14 @@ cd "${DEMO_DIR}" || exit 1
echo "Cloning EVerest from ${DEMO_REPO} into ${DEMO_DIR}/everest-demo"
git clone --branch "${DEMO_BRANCH}" "${DEMO_REPO}" everest-demo

git reset --hard ${CSMS_BRANCH}

if [[ "$DEMO_VERSION" != v1.6j ]]; then
echo "Cloning ${CSMS} CSMS from ${CSMS_REPO} into ${DEMO_DIR}/${CSMS}-csms and starting it"
git clone ${CSMS_REPO} ${CSMS}-csms

pushd ${CSMS}-csms || exit 1

git reset --hard ${CSMS_BRANCH}

# Set up CSMS
echo "Setting up ${CSMS}"
if [[ "$CSMS" == "citrine" ]]; then
Expand Down

0 comments on commit d021011

Please sign in to comment.