100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Minor CI/CD update (#748)
Rich Turner6af7b9396c55
diff --git a/.ci_cd/deploy.sh b/.ci_cd/deploy.shindex 97e3549a0..ebcd4dbaa 100644--- a/.ci_cd/deploy.sh+++ b/.ci_cd/deploy.sh@@ -100,8 +100,10 @@ if [ -n "$SSH_USER" ]; thenfi# Grant SSH access to this runner's public IP on AWS-if [ "$SKIP_SSH_WHITELIST" != 'true' ]; then+if [ "$SKIP_SSH_WHITELIST" != 'true' ] && [ -n "$AWS_ACCESS_KEY_ID" ]; then+ echo "Granting AWS SSH access to github runner"+source temp/aws/login.shif [ -n "$CIDR" ]; thendiff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.ymlindex 3a77e2c9d..2b4dd841b 100644--- a/.github/workflows/ci_cd.yml+++ b/.github/workflows/ci_cd.yml@@ -651,14 +651,14 @@ jobs:- name: Run install distif: steps.install-command.outputs.value != ''shell: python- run: |+ run: |import jsonimport osimport sysimport subprocessinputsAndSecrets = json.loads(os.getenv("INPUTS_AND_SECRETS"))-+# Output inputs and secrets as environment variables for buildfor key, value in inputsAndSecrets.items():if "." in key:@@ -685,7 +685,7 @@ jobs:env:CMD: ${{ steps.install-command.outputs.value }}INPUTS_AND_SECRETS: ${{ toJSON(steps.inputs-and-secrets.outputs) }}- timeout-minutes: 10+ timeout-minutes: 20- name: Run manager docker build commandif: steps.manager-docker-command.outputs.value != ''