test: try using same mamba forge install method

Signed-off-by: vsoch <vsoch@users.noreply.github.com>

Author: vsoch

.github/scripts/setup.sh

@@ -36,10 +36,7 @@ if [[ "$(uname)" == "Darwin" ]]; then
   export DYLD_LIBRARY_PATH=/usr/local/lib
 
   # Ensure we activate micromamabe that has a pinned version
-  eval "$(micromamba shell hook --shell bash)" || micromamba shell reinit --shell bash
-  micromamba activate build-env
-  echo "Found MacOS Python $(which python3)"
-  PIP_INSTALL="python3 -m pip install"
+  PIP_INSTALL="/opt/conda/bin/python3 -m pip install"
   ln -s $(which glibtoolize) /usr/local/bin/libtoolize
 
   CPPFLAGS="-I${HOMEBREW_PREFIX}/include/lua"
@@ -93,6 +90,11 @@ else
   PIP_INSTALL="/opt/conda/envs/build/bin/python3 -m pip install"
 fi
 
+# Ensure we find micromamba environment first
+export PATH=/opt/conda/bin:$PATH
+export LD_LIBRARY_PATH=/opt/conda/lib:/opt/conda/lib64
+echo "Found MacOS Python $(which python3)"
+
 # Here we can start common setup (we hope)
 echo "Flux Version for pypi is ${FLUX_VERSION}"
 if [[ "$(uname)" == "Darwin" ]]; then
@@ -108,11 +110,11 @@ here=$(pwd)
 # I like how "--break-system-packages" is analogous with --i-acknowledge-i-am-a-terrible-person
 if [[ "$(uname)" == "Darwin" ]]; then
   echo "Installing python requirements for MacOS"
-  ${PIP_INSTALL} IPython setuptools ply sphinx cffi
+  ${PIP_INSTALL} IPython setuptools ply sphinx cffi pyyaml
   ${PIP_INSTALL} -r .github/scripts/requirements-dev.txt
 else
   echo "Installing python requirements for Linux"
-  ${PIP_INSTALL} IPython || ${PIP_INSTALL} IPython --break-system-packages
+  ${PIP_INSTALL} IPython pyyaml || ${PIP_INSTALL} IPython --break-system-packages pyyaml
   ${PIP_INSTALL} -r .github/scripts/requirements-dev.txt || ${PIP_INSTALL} -r .github/scripts/requirements-dev.txt --break-system-packages
 
   # Flux Security --
@@ -136,10 +138,12 @@ chmod +x etc/gen-cmdhelp.py
 
 ./autogen.sh || echo "No autogen here"
 
+export PYTHON=/opt/conda/bin/python3
+
 if [[ "$(uname)" == "Darwin" ]]; then
-  CPPFLAGS="$CPPFLAGS" LDFLAGS=$LDFLAGS PKG_CONFIG_PATH=$PKG_CONFIG_PATH \
-    ./configure --with-external-libev --prefix=/usr/local
-  ./scripts/check-macos.sh
+  CPPFLAGS="$CPPFLAGS" LDFLAGS=$LDFLAGS PKG_CONFIG_PATH=$PKG_CONFIG_PATH ./configure --prefix=/usr/local
+  ls ./scripts
+  ./scripts/check-macos.sh || echo "No check-macos.sh"
 else
   ./configure --prefix=/usr/local
   make VERBOSE=1

.github/workflows/build-release.yaml

@@ -32,20 +32,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Setup Python (Linux)
-      if: runner.os == 'Linux'
+    - name: Setup Python
       env:
         python_version: ${{ matrix.python }}
       run: /bin/bash ./docker/install-mamba.sh ${{ matrix.python }}
 
-    # Use micromamba for MacOS and hope someone else figured this out :)
-    - name: Setup Python (macOS)
-      if: runner.os == 'macOS'
-      uses: mamba-org/setup-micromamba@v1
-      with:
-        environment-name: build-env
-        create-args: python=${{ matrix.python }}
-
     # The login shell ensures the mamba env is active
     - name: Build Flux Core Branch
       env:

docker/install-mamba.sh

@@ -6,7 +6,11 @@ sudo apt-get update && sudo apt-get install -y curl
 
 # Install mamba for different python versions
 # Python - instead of a system python we install mamba
-curl -L https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Mambaforge-24.3.0-0-Linux-x86_64.sh > mambaforge.sh
+if [[ "$(uname)" == "Darwin" ]]; then
+    curl -L https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Darwin-x86_64.sh > mambaforge.sh
+else
+    curl -L https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Mambaforge-24.3.0-0-Linux-x86_64.sh > mambaforge.sh
+fi
 
 # Does not build 3.8
 # curl -L https://github.com/conda-forge/miniforge/releases/download/24.11.3-0/Miniforge3-24.11.3-0-Linux-x86_64.sh > mambaforge.sh
@@ -18,6 +22,6 @@ sudo /opt/conda/bin/mamba activate build
 
 # This is intended to run in the container
 echo "Building Python version ${version}"
-/opt/conda/envs/build/bin/python3 -m pip install cffi ply six pyyaml jsonschema
+/opt/conda/envs/build/bin/python3 -m pip install cffi ply six pyyaml jsonschema yaml
 sudo chown -R $(id -u) /opt/conda
 /opt/conda/envs/build/bin/python3 -m pip install --upgrade pkginfo