Skip to content

Commit 2bfe7da

Browse files
jonahbeckfordjonahbeckford
committed
bugfix: Only get dockcross when in_docker
1 parent aa75a1f commit 2bfe7da

File tree

10 files changed

+15
-15
lines changed

10 files changed

+15
-15
lines changed

‎src/scripts/setup-dkml.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ install -d .ci/sd4/dist
261261
tar cf .ci/sd4/dist/run-with-env.tar -T /dev/null
262262

263263
do_get_dockcross() {
264-
if [ -n "${dockcross_image:-}" ]; then
264+
if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then
265265
# The dockcross script is super-slow
266266
section_begin get-dockcross 'Get dockcross binary (ManyLinux)'
267267
install -d .ci/sd4

‎test/gh-darwin/pre/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ runs:
593593
tar cf .ci/sd4/dist/run-with-env.tar -T /dev/null
594594
595595
do_get_dockcross() {
596-
if [ -n "${dockcross_image:-}" ]; then
596+
if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then
597597
# The dockcross script is super-slow
598598
section_begin get-dockcross 'Get dockcross binary (ManyLinux)'
599599
install -d .ci/sd4
@@ -1770,7 +1770,7 @@ runs:
17701770
shell: bash
17711771
run: |
17721772
set -x
1773-
echo '479da2-${{ inputs.FDOPEN_OPAMEXE_BOOTSTRAP }}-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}-${{ steps.full_matrix_vars.outputs.bootstrap_opam_version }}' > .ci/sd4/cachekey.opam.binaries
1773+
echo '28df77-${{ inputs.FDOPEN_OPAMEXE_BOOTSTRAP }}-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}-${{ steps.full_matrix_vars.outputs.bootstrap_opam_version }}' > .ci/sd4/cachekey.opam.binaries
17741774
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
17751775
echo '${{ inputs.OCAML_COMPILER }}-${{ inputs.DISKUV_OPAM_REPOSITORY }}-${{ inputs.DKML_COMPILER }}-${{ inputs.CONF_DKML_CROSS_TOOLCHAIN }}' > .ci/sd4/cachekey.ci.inputs
17761776

‎test/gh-linux/pre/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ runs:
621621
tar cf .ci/sd4/dist/run-with-env.tar -T /dev/null
622622
623623
do_get_dockcross() {
624-
if [ -n "${dockcross_image:-}" ]; then
624+
if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then
625625
# The dockcross script is super-slow
626626
section_begin get-dockcross 'Get dockcross binary (ManyLinux)'
627627
install -d .ci/sd4
@@ -1798,7 +1798,7 @@ runs:
17981798
shell: bash
17991799
run: |
18001800
set -x
1801-
echo '479da2-${{ inputs.FDOPEN_OPAMEXE_BOOTSTRAP }}-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}-${{ steps.full_matrix_vars.outputs.bootstrap_opam_version }}' > .ci/sd4/cachekey.opam.binaries
1801+
echo '28df77-${{ inputs.FDOPEN_OPAMEXE_BOOTSTRAP }}-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}-${{ steps.full_matrix_vars.outputs.bootstrap_opam_version }}' > .ci/sd4/cachekey.opam.binaries
18021802
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
18031803
echo '${{ inputs.OCAML_COMPILER }}-${{ inputs.DISKUV_OPAM_REPOSITORY }}-${{ inputs.DKML_COMPILER }}-${{ inputs.CONF_DKML_CROSS_TOOLCHAIN }}' > .ci/sd4/cachekey.ci.inputs
18041804

‎test/gh-windows/pre/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ runs:
654654
tar cf .ci/sd4/dist/run-with-env.tar -T /dev/null
655655
656656
do_get_dockcross() {
657-
if [ -n "${dockcross_image:-}" ]; then
657+
if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then
658658
# The dockcross script is super-slow
659659
section_begin get-dockcross 'Get dockcross binary (ManyLinux)'
660660
install -d .ci/sd4
@@ -1969,7 +1969,7 @@ runs:
19691969
shell: bash
19701970
run: |
19711971
set -x
1972-
echo '479da2-${{ inputs.FDOPEN_OPAMEXE_BOOTSTRAP }}-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}-${{ steps.full_matrix_vars.outputs.bootstrap_opam_version }}' > .ci/sd4/cachekey.opam.binaries
1972+
echo '28df77-${{ inputs.FDOPEN_OPAMEXE_BOOTSTRAP }}-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}-${{ steps.full_matrix_vars.outputs.bootstrap_opam_version }}' > .ci/sd4/cachekey.opam.binaries
19731973
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
19741974
echo '${{ inputs.OCAML_COMPILER }}-${{ inputs.DISKUV_OPAM_REPOSITORY }}-${{ inputs.DKML_COMPILER }}-${{ inputs.CONF_DKML_CROSS_TOOLCHAIN }}' > .ci/sd4/cachekey.ci.inputs
19751975

‎test/gl/setup-dkml.gitlab-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ variables:
877877
tar cf .ci/sd4/dist/run-with-env.tar -T /dev/null
878878
879879
do_get_dockcross() {
880-
if [ -n "${dockcross_image:-}" ]; then
880+
if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then
881881
# The dockcross script is super-slow
882882
section_begin get-dockcross 'Get dockcross binary (ManyLinux)'
883883
install -d .ci/sd4
@@ -2868,7 +2868,7 @@ variables:
28682868
tar cf .ci/sd4/dist/run-with-env.tar -T /dev/null
28692869
28702870
do_get_dockcross() {
2871-
if [ -n "${dockcross_image:-}" ]; then
2871+
if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then
28722872
# The dockcross script is super-slow
28732873
section_begin get-dockcross 'Get dockcross binary (ManyLinux)'
28742874
install -d .ci/sd4
@@ -4577,7 +4577,7 @@ variables:
45774577
tar cf .ci/sd4/dist/run-with-env.tar -T /dev/null
45784578
45794579
do_get_dockcross() {
4580-
if [ -n "${dockcross_image:-}" ]; then
4580+
if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then
45814581
# The dockcross script is super-slow
45824582
section_begin get-dockcross 'Get dockcross binary (ManyLinux)'
45834583
install -d .ci/sd4

‎test/pc/setup-dkml-darwin_x86_64.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1300,7 +1300,7 @@ install -d .ci/sd4/dist
13001300
tar cf .ci/sd4/dist/run-with-env.tar -T /dev/null
13011301
13021302
do_get_dockcross() {
1303-
if [ -n "${dockcross_image:-}" ]; then
1303+
if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then
13041304
# The dockcross script is super-slow
13051305
section_begin get-dockcross 'Get dockcross binary (ManyLinux)'
13061306
install -d .ci/sd4

‎test/pc/setup-dkml-linux_x86.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1307,7 +1307,7 @@ install -d .ci/sd4/dist
13071307
tar cf .ci/sd4/dist/run-with-env.tar -T /dev/null
13081308
13091309
do_get_dockcross() {
1310-
if [ -n "${dockcross_image:-}" ]; then
1310+
if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then
13111311
# The dockcross script is super-slow
13121312
section_begin get-dockcross 'Get dockcross binary (ManyLinux)'
13131313
install -d .ci/sd4

‎test/pc/setup-dkml-linux_x86_64.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1307,7 +1307,7 @@ install -d .ci/sd4/dist
13071307
tar cf .ci/sd4/dist/run-with-env.tar -T /dev/null
13081308
13091309
do_get_dockcross() {
1310-
if [ -n "${dockcross_image:-}" ]; then
1310+
if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then
13111311
# The dockcross script is super-slow
13121312
section_begin get-dockcross 'Get dockcross binary (ManyLinux)'
13131313
install -d .ci/sd4

‎test/pc/setup-dkml-windows_x86.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1553,7 +1553,7 @@ install -d .ci/sd4/dist
15531553
tar cf .ci/sd4/dist/run-with-env.tar -T /dev/null
15541554
15551555
do_get_dockcross() {
1556-
if [ -n "${dockcross_image:-}" ]; then
1556+
if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then
15571557
# The dockcross script is super-slow
15581558
section_begin get-dockcross 'Get dockcross binary (ManyLinux)'
15591559
install -d .ci/sd4

‎test/pc/setup-dkml-windows_x86_64.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1552,7 +1552,7 @@ install -d .ci/sd4/dist
15521552
tar cf .ci/sd4/dist/run-with-env.tar -T /dev/null
15531553
15541554
do_get_dockcross() {
1555-
if [ -n "${dockcross_image:-}" ]; then
1555+
if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then
15561556
# The dockcross script is super-slow
15571557
section_begin get-dockcross 'Get dockcross binary (ManyLinux)'
15581558
install -d .ci/sd4

0 commit comments

Comments
 (0)