Skip to content

Commit 09e68aa

Browse files
committed
Sort conf values alphabetically
1 parent a040dc2 commit 09e68aa

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

docker/debian/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ EOF
139139
RUN <<EOF
140140
cat >> $(conan config home)/global.conf <<EOT
141141
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
142-
user.package:distro="debian-${DEBIAN_VERSION}"
143142
tools.info.package_id:confs=["user.package:distro"]
143+
user.package:distro="debian-${DEBIAN_VERSION}"
144144
EOT
145145
EOF
146146

@@ -228,8 +228,8 @@ EOF
228228
RUN <<EOF
229229
cat >> $(conan config home)/global.conf <<EOT
230230
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
231-
user.package:distro="debian-${DEBIAN_VERSION}"
232231
tools.info.package_id:confs=["user.package:distro"]
232+
user.package:distro="debian-${DEBIAN_VERSION}"
233233
EOT
234234
EOF
235235

docker/rhel/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ EOF
109109
RUN <<EOF
110110
cat >> $(conan config home)/global.conf <<EOT
111111
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
112-
user.package:distro="rhel-${RHEL_VERSION}"
113112
tools.info.package_id:confs=["user.package:distro"]
113+
user.package:distro="rhel-${RHEL_VERSION}"
114114
EOT
115115
EOF
116116

@@ -184,8 +184,8 @@ EOF
184184
RUN <<EOF
185185
cat >> $(conan config home)/global.conf <<EOT
186186
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
187-
user.package:distro="rhel-${RHEL_VERSION}"
188187
tools.info.package_id:confs=["user.package:distro"]
188+
user.package:distro="rhel-${RHEL_VERSION}"
189189
EOT
190190
EOF
191191

docker/ubuntu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ EOF
125125
RUN <<EOF
126126
cat >> $(conan config home)/global.conf <<EOT
127127
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
128-
user.package:distro="ubuntu-${UBUNTU_VERSION}"
129128
tools.info.package_id:confs=["user.package:distro"]
129+
user.package:distro="ubuntu-${UBUNTU_VERSION}"
130130
EOT
131131
EOF
132132

@@ -211,8 +211,8 @@ EOF
211211
RUN <<EOF
212212
cat >> $(conan config home)/global.conf <<EOT
213213
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
214-
user.package:distro="ubuntu-${UBUNTU_VERSION}"
215214
tools.info.package_id:confs=["user.package:distro"]
215+
user.package:distro="ubuntu-${UBUNTU_VERSION}"
216216
EOT
217217
EOF
218218

0 commit comments

Comments
 (0)