ci: Override Silicon settings on Intel macOS (3/n)

Fix shell syntax Part of diskuv/dkml-installer-ocaml#80
diskuv · Nov 25, 2023 · fe6ec1a · fe6ec1a
1 parent ee4e51b
commit fe6ec1a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/test/gh-darwin/pre/action.yml b/test/gh-darwin/pre/action.yml
@@ -60,17 +60,17 @@ runs:
       run: |
         # Select correct Darwin matrix variables
         
-        dkml_host_os='darwin';
-        opam_root_cacheable='/Users/runner/.opam';
-        abi_pattern='macos-darwin_all';
-        gh_os='macos-13-xlarge';
-        gh_unix_shell='sh';
-        bootstrap_opam_version='2.2.0-alpha-20221228';
-        dkml_host_abi='darwin_arm64';
-        opam_root='/Users/runner/.opam' ;;
+        dkml_host_os='darwin'
+        opam_root_cacheable='/Users/runner/.opam'
+        abi_pattern='macos-darwin_all'
+        gh_os='macos-13-xlarge'
+        gh_unix_shell='sh'
+        bootstrap_opam_version='2.2.0-alpha-20221228'
+        dkml_host_abi='darwin_arm64'
+        opam_root='/Users/runner/.opam'
         #
-        #   note: All Darwin machines can cross-compile so are the same except dkml_host_abi.
-        dkml_host_abi='${{ matrix.dkml_host_abi }}';
+        #   note: All Darwin machines can cross-compile so they are equal except [dkml_host_abi].
+        dkml_host_abi='${{ matrix.dkml_host_abi }}'
 
         add() {
           echo "$1=$2" | tee -a $GITHUB_OUTPUT | tee -a $GITHUB_ENV

diff --git a/tmpl/gh-darwin/pre/action.yml b/tmpl/gh-darwin/pre/action.yml
@@ -59,9 +59,9 @@ runs:
       id: full_matrix_vars
       run: |
         # Select correct Darwin matrix variables
-        {% for (abi,abi_vars) in gh_vars %}{%- if abi_vars.dkml_host_os == "darwin" -%}{{ nl }}        {% for (name,value) in abi_vars %}{{ name }}={{ squot }}{{ value }}{{ squot }} {%- if loop.last %} ;; {%- else -%} ; {%- endif %}{{ nl }}        {% endfor %}{%- endif %}{% endfor %}#
+        {% for (abi,abi_vars) in gh_vars %}{%- if abi_vars.dkml_host_os == "darwin" -%}{{ nl }}        {% for (name,value) in abi_vars %}{{ name }}={{ squot }}{{ value }}{{ squot }} {%- if loop.last %} {%- else -%} {%- endif %}{{ nl }}        {% endfor %}{%- endif %}{% endfor %}#
         #   note: All Darwin machines can cross-compile so they are equal except [dkml_host_abi].
-        dkml_host_abi='{% raw -%}${{ matrix.dkml_host_abi }}{%- endraw %}';
+        dkml_host_abi='{% raw -%}${{ matrix.dkml_host_abi }}{%- endraw %}'
 
         add() {
           echo "$1=$2" | tee -a $GITHUB_OUTPUT | tee -a $GITHUB_ENV