Skip to content

Commit 43c1ab6

Browse files
added comments to cross.toml, fixed getting the tags and labels in the
push steps of the build pipeline
1 parent 0df01ef commit 43c1ab6

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/containerize-and-push.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ jobs:
7676
file: "Dockerfile.zenoh-mqtt-arm"
7777
push: true
7878
platforms: linux/arm64
79-
tags: ${{ steps.meta.outputs.tags }}
80-
labels: ${{ steps.meta.outputs.labels }}
79+
tags: ${{ needs.setup.outputs.tags }}
80+
labels: ${{ needs.setup.outputs.labels }}
8181

8282
build-amd64:
8383
needs: setup
@@ -111,5 +111,5 @@ jobs:
111111
file: "Dockerfile.zenoh-mqtt-amd"
112112
push: true
113113
platforms: linux/amd64
114-
tags: ${{ steps.meta.outputs.tags }}
115-
labels: ${{ steps.meta.outputs.labels }}
114+
tags: ${{ needs.setup.outputs.tags }}
115+
labels: ${{ needs.setup.outputs.labels }}

Cross.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# *******************************************************************************/
1313

1414
[build.env]
15+
# This overrides the CMake toolchain file that Cross natively wants to use,
16+
# since it causes problems with the vendored OpenSSL version that Paho wants to use
1517
passthrough = [
1618
"CMAKE_TOOLCHAIN_FILE_aarch64_unknown_linux_musl",
1719
"CMAKE_TOOLCHAIN_FILE_x86_64_unknown_linux_musl",

0 commit comments

Comments
 (0)