Merge pull request #269 from codecov/joseph/universal2-gha

Build macos cli executable using universal2 python

Author: joseph-sentry

.github/workflows/release_flow.yml

@@ -17,10 +17,10 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: true
-    - name: Set up Python 3.10
+    - name: Set up Python 3.11
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.11"
     - name: Install dependencies
       run: |
         pip install -r requirements.txt
@@ -43,15 +43,23 @@ jobs:
       matrix:
         include:
           - os: macos-latest
+            env:
+              CFLAGS: '-arch arm64 -arch x86_64'
             TARGET: macos
+            CMD_REQS: >
+              mkdir -p pip-packages && cd pip-packages && pip wheel --no-cache-dir -r ../requirements.txt && cd ..
+              pip install --no-deps --no-index --find-links=pip-packages pip-packages/*
             CMD_BUILD: >
               STATICCODECOV_LIB_PATH=$(find build/ -maxdepth 1 -type d -name 'lib.*' -print -quit | xargs -I {} sh -c "find {} -type f -name 'staticcodecov*' -print -quit | sed 's|^./||'") &&
               pyinstaller --add-binary ${STATICCODECOV_LIB_PATH}:. --hidden-import staticcodecov_languages -F codecov_cli/main.py &&
-              mv dist/main dist/codecovcli_macos
+              mv dist/main dist/codecovcli_macos &&
+              lipo -archs dist/codecovcli_macos | grep -v 'x86_64 arm65' >> /dev/null && exit 1
             OUT_FILE_NAME: codecovcli_macos
             ASSET_MIME: application/octet-stream
           - os: ubuntu-latest
             TARGET: ubuntu
+            CMD_REQS: >
+              pip install -r requirements.txt
             CMD_BUILD: >
               STATICCODECOV_LIB_PATH=$(find build/ -maxdepth 1 -type d -name 'lib.*' -print -quit | xargs -I {} sh -c "find {} -type f -name 'staticcodecov*' -print -quit | sed 's|^./||'") &&
               pyinstaller --add-binary ${STATICCODECOV_LIB_PATH}:. --hidden-import staticcodecov_languages -F codecov_cli/main.py &&
@@ -60,6 +68,8 @@ jobs:
             ASSET_MIME: application/octet-stream
           - os: windows-latest
             TARGET: windows
+            CMD_REQS: >
+              pip install -r requirements.txt
             CMD_BUILD: >
               pyinstaller --add-binary "build\lib.win-amd64-cpython-310\staticcodecov_languages.cp310-win_amd64.pyd;." --hidden-import staticcodecov_languages -F codecov_cli\main.py &&
               Copy-Item -Path ".\dist\main.exe" -Destination ".\dist\codecovcli_windows.exe"
@@ -69,13 +79,13 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: true
-    - name: Set up Python 3.10
+    - name: Set up Python 3.11
       uses: actions/setup-python@v3
       with:
-        python-version: "3.10"
+        python-version: "3.11"
     - name: Install dependencies
       run: |
-        pip install -r requirements.txt
+        ${{matrix.CMD_REQS}}
         python setup.py build
     - name: Install pyinstaller
       run: pip install pyinstaller