diff --git a/.github/workflows/macos_arm64.yaml b/.github/workflows/macos_arm64.yaml index a392ae3e..777b6a8b 100644 --- a/.github/workflows/macos_arm64.yaml +++ b/.github/workflows/macos_arm64.yaml @@ -4,6 +4,49 @@ on: [workflow_dispatch] env: WHEEL_SDIR: wheelhouse jobs: + build_psutil: + name: psutil ${{ matrix.python }} ${{ matrix.os-name }} ${{ matrix.platform }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: ["ubuntu-22.04"] + python: ["3.12"] + platform: ["x86_64"] + os-name: ["jammy"] + env: + REPO_DIR: psutil + BUILD_COMMIT: release-6.0.0 + WHEEL_SDIR: wheelhouse + PLAT: "${{ matrix.platform }}" + MB_PYTHON_VERSION: "${{ matrix.python }}" + MB_ML_VER: "2014" + BUILD_DEPENDS: "cython wheel setuptools" + TEST_DEPENDS: "cython" + TRAVIS_OS_NAME: ${{ matrix.os-name }} + MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-target }} + steps: + - uses: actions/checkout@v4 + with: + submodules: true + - uses: actions/setup-python@v5 + with: + python-version: "3.10" + - name: get code of psutil + run: | + echo $PATH + bash -x .github/workflows/build.sh + - name: Build Wheel of psutil + run: | + sudo apt install python3-virtualenv + - name: Build Wheel of pyproj + run: | + bash -x .github/workflows/wheel.sh + - uses: actions/upload-artifact@v3 + with: + name: wheels + path: wheelhouse + build_pyproj: name: pyproj ${{ matrix.python }} ${{ matrix.os-name }} ${{ matrix.platform }} runs-on: ${{ matrix.os }} diff --git a/.github/workflows/macos_x86_64.yaml b/.github/workflows/macos_x86_64.yaml index 2b9c1b8f..ff8b1c0b 100644 --- a/.github/workflows/macos_x86_64.yaml +++ b/.github/workflows/macos_x86_64.yaml @@ -6,6 +6,49 @@ env: HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1 jobs: + build_psutil: + name: psutil ${{ matrix.python }} ${{ matrix.os-name }} ${{ matrix.platform }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: ["ubuntu-22.04"] + python: ["3.12"] + platform: ["x86_64"] + os-name: ["jammy"] + env: + REPO_DIR: psutil + BUILD_COMMIT: release-6.0.0 + WHEEL_SDIR: wheelhouse + PLAT: "${{ matrix.platform }}" + MB_PYTHON_VERSION: "${{ matrix.python }}" + MB_ML_VER: "2014" + BUILD_DEPENDS: "cython wheel setuptools" + TEST_DEPENDS: "cython" + TRAVIS_OS_NAME: ${{ matrix.os-name }} + MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-target }} + steps: + - uses: actions/checkout@v4 + with: + submodules: true + - uses: actions/setup-python@v5 + with: + python-version: "3.10" + - name: get code of psutil + run: | + echo $PATH + bash -x .github/workflows/build.sh + - name: Build Wheel of psutil + run: | + sudo apt install python3-virtualenv + - name: Build Wheel of pyproj + run: | + bash -x .github/workflows/wheel.sh + - uses: actions/upload-artifact@v3 + with: + name: wheels + path: wheelhouse + build_pyproj: name: pyproj ${{ matrix.python }} ${{ matrix.os-name }} ${{ matrix.platform }} runs-on: ${{ matrix.os }} diff --git a/multibuild/common_utils.sh b/multibuild/common_utils.sh index 1a97fec8..1f851a4a 100755 --- a/multibuild/common_utils.sh +++ b/multibuild/common_utils.sh @@ -414,7 +414,8 @@ function get_os { function get_platform { # Report platform as given by uname # Use any Python that comes to hand. - python3 -c 'import platform; print(platform.uname()[4])' + #python3 -c 'import platform; print(platform.uname()[4])' + python -c 'import platform; print(platform.uname()[4])' } if [ "$(get_platform)" == x86_64 ] || \