ci: use released integration-python-library version tag

unfoldedcircle · Nov 2, 2023 · f311249 · f311249
1 parent 1a72a8c
commit f311249
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,8 +16,8 @@ env:
   INTG_NAME: denonavr
   HASH_FILENAME: uc-intg-denonavr.hash
   INTG_LIB_VER: 0.1.0
-  # use development branch while refactoring
-  INTG_LIB_GIT: refactor
+  # Python version to use in the builder image. See https://hub.docker.com/r/arm64v8/python for possible versions.
+  PYTHON_VER: 3.10.13
 
 jobs:
   build:
@@ -30,23 +30,23 @@ jobs:
       - name: Clone integrations library
         shell: bash
         run: |
-          git clone https://martonborzak:${{ secrets.PAT }}@github.com/aitatoi/integration-python-library.git
+          git clone --depth 1 --branch v${INTG_LIB_VER} https://martonborzak:${{ secrets.PAT }}@github.com/aitatoi/integration-python-library.git
           ls -lah
-          cd integration-python-library
-          # git checkout v${INTG_LIB_VER}
-          git checkout $INTG_LIB_GIT
 
       - name: Prepare
         run: |
           sudo apt-get update && sudo apt-get install -y qemu binfmt-support qemu-user-static
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          docker run --name builder --platform=aarch64 -v ${GITHUB_WORKSPACE}:/io -d ubuntu:focal tail -f /dev/null
+          # do NOT update the Debian image! Bookworm contains a newer libc which is not available on UCR2
+          docker run --name builder --platform=aarch64 -v ${GITHUB_WORKSPACE}:/io -d arm64v8/python:${PYTHON_VER}-bullseye tail -f /dev/null
           
-          docker exec builder bash -c "apt-get update && apt-get install -y python3-pip"
-          docker exec builder bash -c "cd /io/integration-python-library && python3 setup.py bdist_wheel && pip3 install -I dist/ucapi-${INTG_LIB_VER}-py3-none-any.whl"
-          docker exec builder bash -c "pip3 install pyinstaller -r /io/requirements.txt"
+          echo "Building and installing integration-python-library"
+          docker exec builder bash -c "cd /io/integration-python-library && python3 setup.py bdist_wheel && python3 -m pip install -I dist/ucapi-${INTG_LIB_VER}-py3-none-any.whl"
+          echo "Installing pyinstaller"
+          docker exec builder bash -c "python -m pip install pyinstaller -r /io/requirements.txt"
+          echo "Running pyinstaller"
           docker exec builder bash -c "cd /io && pyinstaller --clean --onefile --name intg-denonavr intg-denonavr/driver.py"
-            
+
       - name: Fetch all tags to determine version
         run: |
           git fetch origin +refs/tags/*:refs/tags/*

diff --git a/.github/workflows/python-code-format.yml b/.github/workflows/python-code-format.yml
@@ -20,8 +20,6 @@ permissions:
 
 env:
   INTG_LIB_VER: 0.1.0
-  # use development branch while refactoring
-  INTG_LIB_GIT: refactor
 
 jobs:
   test:
@@ -44,10 +42,8 @@ jobs:
       - name: Clone & install integrations library
         shell: bash
         run: |
-          git clone https://martonborzak:${{ secrets.PAT }}@github.com/aitatoi/integration-python-library.git
+          git clone --depth 1 --branch v${INTG_LIB_VER} https://martonborzak:${{ secrets.PAT }}@github.com/aitatoi/integration-python-library.git
           cd integration-python-library
-          # git checkout v${INTG_LIB_VER}
-          git checkout $INTG_LIB_GIT
           pip install wheel
           python setup.py bdist_wheel
           ls -lah dist