Skip to content

Commit

Permalink
Add newlines to aid printing to CI console
Browse files Browse the repository at this point in the history
  • Loading branch information
jonahbeckford committed Oct 20, 2024
1 parent d0be661 commit f6811b8
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions src/scripts/setup-dkml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then
install -d .ci/sd4/docker-image
# Since GitLab CI limits environment variables to 255 characters, if you need to exceed that there are five (5)
# variations of `dockcross_packages_apt` and `dockcross_packages_yum` to spread the packages over.
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s" \
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s\n" \
"${dockcross_image:-}" "${docker_fqin_preusername}" \
"${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \
"${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \
Expand All @@ -84,7 +84,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${docker_image:-}" ]; then
section_begin docker-build "Summary: docker build --quiet --tag ${docker_fqin_preusername}dkml-workflows/docker"

install -d .ci/sd4/docker-image
printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \
printf "FROM %s\nRUN %s\n" "$docker_image" "${docker_assemble_command:-true}" \
|tee .ci/sd4/docker-image/Dockerfile
docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image

Expand Down
6 changes: 3 additions & 3 deletions test/gh-darwin/pre/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ runs:
install -d .ci/sd4/docker-image
# Since GitLab CI limits environment variables to 255 characters, if you need to exceed that there are five (5)
# variations of `dockcross_packages_apt` and `dockcross_packages_yum` to spread the packages over.
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s" \
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s\n" \
"${dockcross_image:-}" "${docker_fqin_preusername}" \
"${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \
"${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \
Expand All @@ -445,7 +445,7 @@ runs:
section_begin docker-build "Summary: docker build --quiet --tag ${docker_fqin_preusername}dkml-workflows/docker"
install -d .ci/sd4/docker-image
printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \
printf "FROM %s\nRUN %s\n" "$docker_image" "${docker_assemble_command:-true}" \
|tee .ci/sd4/docker-image/Dockerfile
docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image
Expand Down Expand Up @@ -1808,7 +1808,7 @@ runs:
shell: bash
run: |
set -x
echo '914f45-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.dkml_target_abi }}' > .ci/sd4/cachekey.opam.binaries
echo '7b3d80-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.dkml_target_abi }}' > .ci/sd4/cachekey.opam.binaries
echo '${{ steps.full_matrix_vars.outputs.abi_pattern }}-${{ steps.full_matrix_vars.outputs.vsstudio_arch }}-${{ steps.full_matrix_vars.outputs.vsstudio_hostarch }}-${{ steps.full_matrix_vars.outputs.vsstudio_dir }}-${{ steps.full_matrix_vars.outputs.vsstudio_vcvarsver }}-${{ steps.full_matrix_vars.outputs.vsstudio_winsdkver }}-${{ steps.full_matrix_vars.outputs.vsstudio_msvspreference }}-${{ steps.full_matrix_vars.outputs.vsstudio_cmakegenerator }}' > .ci/sd4/cachekey.vsstudio
echo '${{ inputs.OCAML_COMPILER }}-${{ inputs.DISKUV_OPAM_REPOSITORY }}-${{ inputs.DKML_COMPILER }}-${{ inputs.CONF_DKML_CROSS_TOOLCHAIN }}' > .ci/sd4/cachekey.ci.inputs
Expand Down
6 changes: 3 additions & 3 deletions test/gh-linux/pre/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ runs:
install -d .ci/sd4/docker-image
# Since GitLab CI limits environment variables to 255 characters, if you need to exceed that there are five (5)
# variations of `dockcross_packages_apt` and `dockcross_packages_yum` to spread the packages over.
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s" \
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s\n" \
"${dockcross_image:-}" "${docker_fqin_preusername}" \
"${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \
"${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \
Expand All @@ -471,7 +471,7 @@ runs:
section_begin docker-build "Summary: docker build --quiet --tag ${docker_fqin_preusername}dkml-workflows/docker"
install -d .ci/sd4/docker-image
printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \
printf "FROM %s\nRUN %s\n" "$docker_image" "${docker_assemble_command:-true}" \
|tee .ci/sd4/docker-image/Dockerfile
docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image
Expand Down Expand Up @@ -1834,7 +1834,7 @@ runs:
shell: bash
run: |
set -x
echo '914f45-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.dkml_target_abi }}' > .ci/sd4/cachekey.opam.binaries
echo '7b3d80-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.dkml_target_abi }}' > .ci/sd4/cachekey.opam.binaries
echo '${{ steps.full_matrix_vars.outputs.abi_pattern }}-${{ steps.full_matrix_vars.outputs.vsstudio_arch }}-${{ steps.full_matrix_vars.outputs.vsstudio_hostarch }}-${{ steps.full_matrix_vars.outputs.vsstudio_dir }}-${{ steps.full_matrix_vars.outputs.vsstudio_vcvarsver }}-${{ steps.full_matrix_vars.outputs.vsstudio_winsdkver }}-${{ steps.full_matrix_vars.outputs.vsstudio_msvspreference }}-${{ steps.full_matrix_vars.outputs.vsstudio_cmakegenerator }}' > .ci/sd4/cachekey.vsstudio
echo '${{ inputs.OCAML_COMPILER }}-${{ inputs.DISKUV_OPAM_REPOSITORY }}-${{ inputs.DKML_COMPILER }}-${{ inputs.CONF_DKML_CROSS_TOOLCHAIN }}' > .ci/sd4/cachekey.ci.inputs
Expand Down
6 changes: 3 additions & 3 deletions test/gh-windows/pre/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ runs:
install -d .ci/sd4/docker-image
# Since GitLab CI limits environment variables to 255 characters, if you need to exceed that there are five (5)
# variations of `dockcross_packages_apt` and `dockcross_packages_yum` to spread the packages over.
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s" \
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s\n" \
"${dockcross_image:-}" "${docker_fqin_preusername}" \
"${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \
"${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \
Expand All @@ -504,7 +504,7 @@ runs:
section_begin docker-build "Summary: docker build --quiet --tag ${docker_fqin_preusername}dkml-workflows/docker"
install -d .ci/sd4/docker-image
printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \
printf "FROM %s\nRUN %s\n" "$docker_image" "${docker_assemble_command:-true}" \
|tee .ci/sd4/docker-image/Dockerfile
docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image
Expand Down Expand Up @@ -2005,7 +2005,7 @@ runs:
shell: bash
run: |
set -x
echo '914f45-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.dkml_target_abi }}' > .ci/sd4/cachekey.opam.binaries
echo '7b3d80-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.dkml_target_abi }}' > .ci/sd4/cachekey.opam.binaries
echo '${{ steps.full_matrix_vars.outputs.abi_pattern }}-${{ steps.full_matrix_vars.outputs.vsstudio_arch }}-${{ steps.full_matrix_vars.outputs.vsstudio_hostarch }}-${{ steps.full_matrix_vars.outputs.vsstudio_dir }}-${{ steps.full_matrix_vars.outputs.vsstudio_vcvarsver }}-${{ steps.full_matrix_vars.outputs.vsstudio_winsdkver }}-${{ steps.full_matrix_vars.outputs.vsstudio_msvspreference }}-${{ steps.full_matrix_vars.outputs.vsstudio_cmakegenerator }}' > .ci/sd4/cachekey.vsstudio
echo '${{ inputs.OCAML_COMPILER }}-${{ inputs.DISKUV_OPAM_REPOSITORY }}-${{ inputs.DKML_COMPILER }}-${{ inputs.CONF_DKML_CROSS_TOOLCHAIN }}' > .ci/sd4/cachekey.ci.inputs
Expand Down
12 changes: 6 additions & 6 deletions test/gl/setup-dkml.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ variables:
install -d .ci/sd4/docker-image
# Since GitLab CI limits environment variables to 255 characters, if you need to exceed that there are five (5)
# variations of `dockcross_packages_apt` and `dockcross_packages_yum` to spread the packages over.
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s" \
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s\n" \
"${dockcross_image:-}" "${docker_fqin_preusername}" \
"${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \
"${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \
Expand All @@ -755,7 +755,7 @@ variables:
section_begin docker-build "Summary: docker build --quiet --tag ${docker_fqin_preusername}dkml-workflows/docker"
install -d .ci/sd4/docker-image
printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \
printf "FROM %s\nRUN %s\n" "$docker_image" "${docker_assemble_command:-true}" \
|tee .ci/sd4/docker-image/Dockerfile
docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image
Expand Down Expand Up @@ -2762,7 +2762,7 @@ variables:
install -d .ci/sd4/docker-image
# Since GitLab CI limits environment variables to 255 characters, if you need to exceed that there are five (5)
# variations of `dockcross_packages_apt` and `dockcross_packages_yum` to spread the packages over.
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s" \
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s\n" \
"${dockcross_image:-}" "${docker_fqin_preusername}" \
"${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \
"${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \
Expand All @@ -2784,7 +2784,7 @@ variables:
section_begin docker-build "Summary: docker build --quiet --tag ${docker_fqin_preusername}dkml-workflows/docker"
install -d .ci/sd4/docker-image
printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \
printf "FROM %s\nRUN %s\n" "$docker_image" "${docker_assemble_command:-true}" \
|tee .ci/sd4/docker-image/Dockerfile
docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image
Expand Down Expand Up @@ -4510,7 +4510,7 @@ variables:
install -d .ci/sd4/docker-image
# Since GitLab CI limits environment variables to 255 characters, if you need to exceed that there are five (5)
# variations of `dockcross_packages_apt` and `dockcross_packages_yum` to spread the packages over.
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s" \
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s\n" \
"${dockcross_image:-}" "${docker_fqin_preusername}" \
"${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \
"${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \
Expand All @@ -4532,7 +4532,7 @@ variables:
section_begin docker-build "Summary: docker build --quiet --tag ${docker_fqin_preusername}dkml-workflows/docker"
install -d .ci/sd4/docker-image
printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \
printf "FROM %s\nRUN %s\n" "$docker_image" "${docker_assemble_command:-true}" \
|tee .ci/sd4/docker-image/Dockerfile
docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image
Expand Down
4 changes: 2 additions & 2 deletions test/pc/setup-dkml-darwin_arm64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1220,7 +1220,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then
install -d .ci/sd4/docker-image
# Since GitLab CI limits environment variables to 255 characters, if you need to exceed that there are five (5)
# variations of `dockcross_packages_apt` and `dockcross_packages_yum` to spread the packages over.
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s" \
printf "FROM %s\nENV DEFAULT_DOCKCROSS_IMAGE %sdkml-workflows/dockcross:latest\nRUN if command -v apt-get; then apt-get update -y && apt-get install -y rsync %s %s %s %s %s && rm -rf /var/lib/apt/lists/*; fi\nRUN if command -v yum; then yum update -y && yum install -y rsync %s %s %s %s %s && yum clean all && rm -rf /var/cache/yum; fi; %s\n" \
"${dockcross_image:-}" "${docker_fqin_preusername}" \
"${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \
"${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \
Expand All @@ -1242,7 +1242,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${docker_image:-}" ]; then
section_begin docker-build "Summary: docker build --quiet --tag ${docker_fqin_preusername}dkml-workflows/docker"
install -d .ci/sd4/docker-image
printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \
printf "FROM %s\nRUN %s\n" "$docker_image" "${docker_assemble_command:-true}" \
|tee .ci/sd4/docker-image/Dockerfile
docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image
Expand Down
Loading

0 comments on commit f6811b8

Please sign in to comment.