Merge pull request #9594 from leseb/fix-locale

build: set LC_ALL on the make target
This commit is contained in:
Sébastien Han authored and GitHub committed 2022-01-18 15:15:17 +01:00
commit 7bfa320528
3 files changed
+8 -13

No files matched your search

+8
View File
@@ -12,6 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Linux doesn't guarantee file ordering, so sort the files to make sure order is deterministic.
# And in order to handle file paths with spaces, it's easiest to read the file names into an array.
# Set locale `LC_ALL=C` because different OSes have different sort behavior;
# `C` sorting order is based on the byte values,
# Reference: https://blog.zhimingwang.org/macos-lc_collate-hunt
LC_ALL=C
export LC_ALL
include build/makelib/common.mk
include build/makelib/helm.mk
-7
View File
@@ -97,13 +97,6 @@ fi
generating_main_crd
# Linux doesn't guarantee file ordering, so we must sort the output to make sure it's deterministic.
# In order to handle file paths with spaces in the yq command below, it's easiest to read the
# file names into an array.
# Set locale `LC_ALL=C` because different OSes have different sort behavior;
# `C` sorting order is based on the byte values,
# Reference: https://blog.zhimingwang.org/macos-lc_collate-hunt
LC_ALL=C
CRD_FILES=()
while read -r line; do
CRD_FILES+=("$line")
-6
View File
@@ -35,12 +35,6 @@ sed '/^# Source: /d' | # helm adds '# Source: <file>' comments atop of each yaml
$YQ eval --split-exp '.kind + " " + .metadata.name + " "' - # split into files by <kind> <name> .yaml
# outputting the filenames with spaces after kind and name keeps the same sorting from before
# Linux doesn't guarantee file ordering, so sort the files to make sure order is deterministic.
# And in order to handle file paths with spaces, it's easiest to read the file names into an array.
# Set locale `LC_ALL=C` because different OSes have different sort behavior;
# `C` sorting order is based on the byte values,
# Reference: https://blog.zhimingwang.org/macos-lc_collate-hunt
LC_ALL=C
RBAC_FILES=()
while read -r line; do
RBAC_FILES+=("$line")