test

vegardit · Jul 20, 2024 · c5e1197 · c5e1197
1 parent cd4ded1
commit c5e1197
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/.github/actions/internal/install-haxelibs/action.yml b/.github/actions/internal/install-haxelibs/action.yml
@@ -112,9 +112,9 @@ runs:
               rm -rf "$HAXELIB_PATH/$lib_name/git"
 
               if [[ $haxelib_version == "4.0.2" ]]; then # workaround for "Uncaught exception - Failed with error: Eof"
-                (set -x; haxelib --debug git --always "$lib_name" "${lib_ver_splitted[0]}" ${lib_ver_splitted[1]:-} || true)
+                (set -x; haxelib git --always "$lib_name" "${lib_ver_splitted[0]}" ${lib_ver_splitted[1]:-} || true)
               else
-                (set -x; haxelib --debug git --always "$lib_name" "${lib_ver_splitted[0]}" ${lib_ver_splitted[1]:-})
+                (set -x; haxelib git --always "$lib_name" "${lib_ver_splitted[0]}" ${lib_ver_splitted[1]:-})
               fi
               continue;
             fi

diff --git a/.github/actions/internal/setup-neko/action.yml b/.github/actions/internal/setup-neko/action.yml
@@ -54,10 +54,15 @@ runs:
           macOS)
             if [[ ! -f "$NEKO_HOME/neko" ]]; then
               rm -rf "$NEKO_HOME"
+              case "$(machine)" in
+                *arm*) archive_suffix=osx-arm64 ;;
+                    *) archive_suffix=osx64 ;;
+              esac
+
               if [[ $NEKO_VERSION == 'latest' ]]; then
-                archive_url=$(eval curl -sSfL ${auth_header:-} https://api.github.com/repos/HaxeFoundation/neko/releases | grep -o "https://.*/download/.*/neko.*-osx64.tar.gz" | head -n 1)
+                archive_url=$(eval curl -sSfL ${auth_header:-} https://api.github.com/repos/HaxeFoundation/neko/releases | grep -o "https://.*/download/.*/neko.*-${archive_suffix}.tar.gz" | head -n 1)
               else
-                archive_url="https://github.com/HaxeFoundation/neko/releases/download/v${NEKO_VERSION//./-}/neko-${NEKO_VERSION}-osx64.tar.gz"
+                archive_url="https://github.com/HaxeFoundation/neko/releases/download/v${NEKO_VERSION//./-}/neko-${NEKO_VERSION}-${archive_suffix}.tar.gz"
               fi
               mkdir -p "$NEKO_HOME"
               $(set -x; curl -sSfL $archive_url | tar -xz --strip-components=1 -C "$NEKO_HOME")

diff --git a/.github/actions/setup-haxe/action.yml b/.github/actions/setup-haxe/action.yml
@@ -112,8 +112,11 @@ runs:
             echo "$HAXE_HOME" >> "$GITHUB_PATH"
             echo "HAXEPATH=$HAXE_HOME" | tee -a "$GITHUB_ENV"
             echo "HAXE_STD_PATH=$HAXE_HOME/std" | tee -a "$GITHUB_ENV"
-            
-            ln -sfv "$(dirname $(which neko))/libneko.2.dylib" "$HAXE_HOME/libneko.2.dylib" # workaround for "dyld: Library not loaded: @rpath/libneko.2.dylib"
+
+            # workaround for "dyld: Library not loaded: @rpath/libneko.2.dylib"
+            (set -x;      ln -sfv "$(dirname $(which neko))/libneko.2.dylib" "$HAXE_HOME/libneko.2.dylib")
+            (set -x; sudo ln -sfv "$(dirname $(which neko))/libneko.2.dylib" /usr/local/lib/libneko.2.dylib)
+
             (set -x; haxelib setup $HAXE_HOME/lib)
             ;;
           Windows)
@@ -138,7 +141,7 @@ runs:
             echo "$(cygpath -w "$HAXE_HOME")" >> "$GITHUB_PATH"
             echo "HAXEPATH=$(cygpath -w "$HAXE_HOME")" | tee -a "$GITHUB_ENV"
             echo "HAXE_STD_PATH=$(cygpath -w "$HAXE_HOME/std")" | tee -a "$GITHUB_ENV"
-            
+
             (set -x; haxelib setup "$(cygpath "$HAXE_HOME")\\lib")
             ;;
         esac
@@ -149,7 +152,6 @@ runs:
       shell: bash
       run: haxe -version # haxe 3 only supports -version. haxe 4 also --version
 
-
     - name: "Install: yq" # https://github.com/mikefarah/yq
       uses: vegardit/gha-setup-yq@v1