Browse Source

[ci] fix cherry picking in wrong order

Rudy Ges 1 year ago
parent
commit
12b134a1ef
2 changed files with 2 additions and 2 deletions
  1. 1 1
      .github/workflows/main.yml
  2. 1 1
      extra/github-actions/build-mac.yml

+ 1 - 1
.github/workflows/main.yml

@@ -678,7 +678,7 @@ jobs:
           set -ex
           set -ex
           eval $(opam env)
           eval $(opam env)
           opam config exec -- make -s -j`sysctl -n hw.ncpu` STATICLINK=1 "LIB_PARAMS=/usr/local/lib/libz.a /usr/local/lib/libpcre2-8.a /usr/local/lib/libmbedtls.a /usr/local/lib/libmbedcrypto.a /usr/local/lib/libmbedx509.a -cclib '-framework Security -framework CoreFoundation'" haxe
           opam config exec -- make -s -j`sysctl -n hw.ncpu` STATICLINK=1 "LIB_PARAMS=/usr/local/lib/libz.a /usr/local/lib/libpcre2-8.a /usr/local/lib/libmbedtls.a /usr/local/lib/libmbedcrypto.a /usr/local/lib/libmbedx509.a -cclib '-framework Security -framework CoreFoundation'" haxe
-          opam config exec -- arch -x86_64 make -s haxelib
+          opam config exec -- make -s haxelib
           make -s package_unix package_installer_mac
           make -s package_unix package_installer_mac
           ls -l out
           ls -l out
           otool -L ./haxe
           otool -L ./haxe

+ 1 - 1
extra/github-actions/build-mac.yml

@@ -49,7 +49,7 @@
     set -ex
     set -ex
     eval $(opam env)
     eval $(opam env)
     opam config exec -- make -s -j`sysctl -n hw.ncpu` STATICLINK=1 "LIB_PARAMS=/usr/local/lib/libz.a /usr/local/lib/libpcre2-8.a /usr/local/lib/libmbedtls.a /usr/local/lib/libmbedcrypto.a /usr/local/lib/libmbedx509.a -cclib '-framework Security -framework CoreFoundation'" haxe
     opam config exec -- make -s -j`sysctl -n hw.ncpu` STATICLINK=1 "LIB_PARAMS=/usr/local/lib/libz.a /usr/local/lib/libpcre2-8.a /usr/local/lib/libmbedtls.a /usr/local/lib/libmbedcrypto.a /usr/local/lib/libmbedx509.a -cclib '-framework Security -framework CoreFoundation'" haxe
-    opam config exec -- arch -x86_64 make -s haxelib
+    opam config exec -- make -s haxelib
     make -s package_unix package_installer_mac
     make -s package_unix package_installer_mac
     ls -l out
     ls -l out
     otool -L ./haxe
     otool -L ./haxe