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
Fix incorrect processing of docker tags (#2845)
Koene5ab75d1114e
diff --git a/.github/actions/process-cicd-json/action.yml b/.github/actions/process-cicd-json/action.ymlindex 4f557acea..aa6514775 100644--- a/.github/actions/process-cicd-json/action.yml+++ b/.github/actions/process-cicd-json/action.yml@@ -80,6 +80,7 @@ runs:if isMainRepo and ((eventName == "release" and isRelease) or (eventName != "release" and not isRelease)):if dockerPublishTags is not None:+ dockerPublishTags = ",".join(map(lambda t: t.strip(), dockerPublishTags.split(",")))if "$version" in dockerPublishTags:firstDockerTag = versiondockerPublishTags = dockerPublishTags.replace("$version", version)@@ -88,8 +89,7 @@ runs:firstDockerTag = dockerPublishTags.split(",")[0]os.system(f"echo 'firstDockerTag={firstDockerTag}' >> $GITHUB_OUTPUT")- print("Manager tags to push to docker hub: {dockerPublishTags}")- dockerPublishTags = " ".join(map(lambda t: t.strip(), dockerPublishTags.split(",")))+ print(f"Manager tags to push to docker hub: {dockerPublishTags}")if repoOwner == 'openremote':os.system(f"echo 'dockerTags={dockerPublishTags}' >> $GITHUB_OUTPUT")diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.ymlindex 306218ef3..9771d25e6 100644--- a/.github/workflows/deployment.yml+++ b/.github/workflows/deployment.yml@@ -36,7 +36,7 @@ jobs:- name: Process ci_cd.json fileid: ci-cd-output- uses: openremote/openremote/.github/actions/process-cicd-json@fa6f52032b1dea3d4ad080cc6436a3ef3843b0be+ uses: openremote/openremote/.github/actions/process-cicd-json@e9e87797bed31cdf6c2de6ec30fd6a05753f35f4with:IS_MAIN_REPO: ${{ steps.is_main_repo.outputs.value }}MANAGER_VERSION: ${{ steps.is_main_repo.outputs.version }}diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.ymlindex 2189b6ead..504aa0e1b 100644--- a/.github/workflows/staging.yml+++ b/.github/workflows/staging.yml@@ -74,7 +74,7 @@ jobs:- name: Process ci_cd.json fileid: ci-cd-output- uses: openremote/openremote/.github/actions/process-cicd-json@fa6f52032b1dea3d4ad080cc6436a3ef3843b0be+ uses: openremote/openremote/.github/actions/process-cicd-json@e9e87797bed31cdf6c2de6ec30fd6a05753f35f4with:IS_MAIN_REPO: ${{ steps.is_main_repo.outputs.value }} # Shouldn't be needed in this contextMANAGER_VERSION: ${{ steps.is_main_repo.outputs.version }}