fix: python wheel incorrect architecture on mac (grafana#162)

Author: korniltsev

.github/workflows/release.yml

@@ -195,7 +195,7 @@ jobs:
         with:
           python-version: 3.11
 
-      - run: make wheel/mac/${{ matrix.mk-arch }}
+      - run: make pyroscope_ffi/clean wheel/mac/${{ matrix.mk-arch }}
 
       - uses: actions/upload-artifact@v2
         with:
@@ -314,9 +314,6 @@ jobs:
     name: macOS - ${{ matrix.target }}
     runs-on: macos-${{ matrix.macos-version }}
 
-    env:
-      RUST_TARGET: ${{ matrix.target }}
-
     steps:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
@@ -328,7 +325,9 @@ jobs:
           target: ${{ matrix.target }}
           profile: minimal
           override: true
-      - run: make gem/mac/${{ matrix.mk-arch }}
+
+      - run: make pyroscope_ffi/clean gem/mac/${{ matrix.mk-arch }}
+
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ github.sha }}

ffi.mk

@@ -33,13 +33,15 @@ wheel/linux/arm64: pyroscope_ffi/clean
 wheel/mac/amd64:
 	cd pyroscope_ffi/python && \
 		pip install wheel && \
-		python setup.py bdist_wheel -p macosx-11_0_x86_64
+		CARGO_BUILD_TARGET=x86_64-apple-darwin \
+			python setup.py bdist_wheel -p macosx-11_0_x86_64
 
 .phony: wheel/mac/arm64
 wheel/mac/arm64:
 	cd pyroscope_ffi/python && \
 		pip install wheel && \
-		python setup.py bdist_wheel -p macosx-11_0_arm64
+		CARGO_BUILD_TARGET=aarch64-apple-darwin \
+			python setup.py bdist_wheel -p macosx-11_0_arm64
 
 
 .phony: gem/linux/amd64
@@ -66,14 +68,14 @@ gem/linux/arm64: pyroscope_ffi/clean
 gem/mac/amd64: pyroscope_ffi/clean
 	cd pyroscope_ffi/ruby && \
 		bundle && \
-		rake rbspy_install && \
-		rake thread_id_install && \
-		rake x86_64_darwin:gem
+		RUST_TARGET=x86_64-apple-darwin rake rbspy_install && \
+		RUST_TARGET=x86_64-apple-darwin rake thread_id_install && \
+		RUST_TARGET=x86_64-apple-darwin rake x86_64_darwin:gem
 
 .phony: gem/mac/arm64
 gem/mac/arm64: pyroscope_ffi/clean
 	cd pyroscope_ffi/ruby && \
 		bundle && \
-		rake rbspy_install && \
-		rake thread_id_install && \
-		rake arm64_darwin:gem
+		RUST_TARGET=aarch64-apple-darwin rake rbspy_install && \
+		RUST_TARGET=aarch64-apple-darwin rake thread_id_install && \
+		RUST_TARGET=aarch64-apple-darwin rake arm64_darwin:gem

pyroscope_ffi/python/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pyroscope-io
-version= 0.8.6
+version= 0.8.7
 description = Pyroscope Python integration
 long_description = file: README.md
 long_description_content_type = text/markdown

pyroscope_ffi/python/setup.py

@@ -15,7 +15,11 @@ def build_native(spec):
     )
 
     def find_dylib():
-        in_path = '../../../target/release'
+        cargo_target = os.environ.get('CARGO_BUILD_TARGET')
+        if cargo_target:
+            in_path = '../../../target/%s/release' % (cargo_target)
+        else:
+            in_path = '../../../target/release'
         return build.find_dylib('pyroscope_ffi', in_path=in_path)
 
     # Step 2: package the compiled library

pyroscope_ffi/ruby/lib/pyroscope/version.rb

@@ -1,3 +1,3 @@
 module Pyroscope
-  VERSION = '0.5.11'.freeze
+  VERSION = '0.5.12'.freeze
 end