Publish Linux ARM binaries

Author: mlech-reef

.github/workflows/cd.yml

@@ -22,8 +22,9 @@ jobs:
     steps:
       - name: Determine if pre-release
         id: prerelease_check
+        # it checks for PEP 440 compatible prerelease tags
         run: |
-          export IS_PRERELEASE=$([[ ${{ github.ref }} =~ [^0-9]$ ]] && echo true || echo false)
+          export IS_PRERELEASE=$([[ ${{ github.ref }} =~ [abrcdev]+[0-9]+$ ]] && echo true || echo false)
           echo "prerelease=$IS_PRERELEASE" >> $GITHUB_OUTPUT
           export PUBLISH_DOCKER=$([[ $IS_PRERELEASE == 'false' && "${{ secrets.DOCKERHUB_USERNAME }}" != '' ]] && echo true || echo false)
           echo "publish_docker=$PUBLISH_DOCKER" >> $GITHUB_OUTPUT
@@ -39,17 +40,17 @@ jobs:
       - name: Build the distribution
         id: build
         run: nox -vs build
-      - name: Read the Changelog
-        id: read-changelog
-        uses: mindsers/changelog-reader-action@v2
-        with:
-          version: ${{ steps.build.outputs.version }}
+#      - name: Read the Changelog
+#        id: read-changelog
+#        uses: mindsers/changelog-reader-action@v2
+#        with:
+#          version: ${{ steps.build.outputs.version }}
       - name: Create GitHub release and upload the distribution
         id: create-release
         uses: softprops/action-gh-release@v2
         with:
           name: ${{ steps.build.outputs.version }}
-          body: ${{ steps.read-changelog.outputs.changes }}
+          body: test
           draft: false
           prerelease: ${{ steps.prerelease_check.outputs.prerelease }}
           files: ${{ steps.build.outputs.asset_path }}
@@ -61,19 +62,23 @@ jobs:
           password: ${{ secrets.B2_PYPI_PASSWORD }}
   deploy-linux-bundle:
     needs: deploy
-    runs-on: ubuntu-latest
-    container:
-      image: "python:3.12"  # can not use ${{ env.PYTHON_DEFAULT_VERSION }} here
-      env:
-        DEBIAN_FRONTEND: noninteractive
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ "ubuntu-22.04", "ubuntu-22.04-arm" ]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }}
+        uses: deadsnakes/[email protected]  # staticx doesn't work with python installed by setup-python action
+        with:
+          python-version: ${{ env.PYTHON_DEFAULT_VERSION }}
       - name: Install dependencies
         run: |
-          apt-get -y update
-          apt-get -y install patchelf
+          sudo apt-get -y update
+          sudo apt-get -y install patchelf scons
           python -m pip install --upgrade nox pdm
           git config --global --add safe.directory '*'
       - name: Bundle the distribution

.github/workflows/ci.yml

@@ -171,7 +171,7 @@ jobs:
     env:
       B2_TEST_APPLICATION_KEY: ${{ secrets.B2_TEST_APPLICATION_KEY }}
       B2_TEST_APPLICATION_KEY_ID: ${{ secrets.B2_TEST_APPLICATION_KEY_ID }}
-      WORKFLOW_ID: ${{ github.run_id }}-${{ github.run_attempt }}-${{ github.job }}    runs-on: ${{ matrix.os }}
+      WORKFLOW_ID: ${{ github.run_id }}-${{ github.run_attempt }}-${{ github.job }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -191,6 +191,11 @@ jobs:
           sudo apt-get -y install patchelf scons
           python -m pip install --upgrade nox pdm
           git config --global --add safe.directory '*'
+      - name: Setup tmate session
+        if: matrix.os == 'ubuntu-22.04-arm'
+        uses: mxschmitt/action-tmate@v3
+        with:
+          limit-access-to-actor: true
       - name: Bundle the distribution
         id: bundle
         shell: bash

noxfile.py

@@ -68,6 +68,7 @@ def _detect_python_nox_id() -> str:
 DOCKER_TEMPLATE = pathlib.Path('docker/Dockerfile.template')
 
 SYSTEM = platform.system().lower()
+MACHINE = platform.machine().lower()
 
 WINDOWS_TIMESTAMP_SERVER = 'http://timestamp.digicert.com'
 WINDOWS_SIGNTOOL_PATH = 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe'
@@ -84,13 +85,19 @@ def _detect_python_nox_id() -> str:
 
 
 def pdm_install(
-    session: nox.Session, *groups: str, dev: bool = True, editable: bool = False
+    session: nox.Session,
+    *groups: str,
+    dev: bool = True,
+    editable: bool = False,
+    no_isolated: bool = False,
 ) -> None:
     args = []
     if not dev:
         args.append('--prod')
     if not editable:
         args.append('--no-editable')
+    if no_isolated:
+        args.extend(['--no-isolated', '--no-self'])
     for group in groups:
         args.extend(['--group', group])
     session.run('pdm', 'install', *args, external=True)
@@ -139,6 +146,18 @@ def get_versions() -> list[str]:
     ]
 
 
+def is_x86_64_architecture():
+    """
+    Determines if the machine's architecture is x86-based.
+
+    This function checks the current machine's architecture and returns
+    whether it belongs to the x86 64-bit family (including x86_64 or amd64).
+    """
+    if MACHINE in ('x86_64', 'amd64'):
+        return True
+    return False
+
+
 @nox.session(name='format', python=PYTHON_DEFAULT_VERSION)
 def format_(session):
     """Lint the code and apply fixes in-place whenever possible."""
@@ -298,20 +317,22 @@ def build(session):
 
 @nox.session(python=PYTHON_DEFAULT_VERSION)
 def dump_license(session: nox.Session):
-    pdm_install(session, 'license', editable=True)
+    pdm_install(session, 'license', editable=True, dev=False)
     session.run('b2', 'license', '--dump', '--with-packages')
 
 
 @nox.session(python=PYTHON_DEFAULT_VERSION)
 def bundle(session: nox.Session):
     """Bundle the distribution."""
 
+    # We need no isolated mode to be able to compile staticx, particularly on ARM machines.
+    pdm_install(session, 'bundle', 'full', no_isolated=True)
+
     # We're running dump_license in another session because:
     # 1. `b2 license --dump` dumps the licence where the module is installed.
     # 2. We don't want to install b2 as editable module in the current session
     #    because that would make `b2 versions` show the versions as editable.
     session.run('nox', '-s', 'dump_license', '-fb', 'venv', external=True)
-    pdm_install(session, 'bundle', 'full')
 
     template_spec = string.Template(pathlib.Path('b2.spec.template').read_text())
     versions = get_versions()
@@ -405,11 +426,15 @@ def sign_windows(keypair_alias, cert_fingerprint):
     else:
         session.error(f'unrecognized platform: {SYSTEM}')
 
-    # Append OS name to all the binaries.
+    # Append OS name and optionally an architecture to all the binaries.
     for asset in pathlib.Path('dist').glob('*'):
         name = asset.stem
         ext = asset.suffix
-        asset_path = f'dist/{name}-{SYSTEM}{ext}'
+        if is_x86_64_architecture():
+            asset_path = f'dist/{name}-{SYSTEM}{ext}'
+        else:
+            asset_path = f'dist/{name}-{SYSTEM}-{MACHINE}{ext}'
+
         session.run('mv', '-f', asset, asset_path, external=True)
 
     # Path have to be specified with unix style slashes even for windows,