Merged PR 26362: Update GitHub build env for pylon 7.5

.github/workflows/build_config.json

@@ -0,0 +1,14 @@
+{
+    "linux-x86_64": {
+        "pylon_sdks": ["7.5.0.15658"]
+    },
+    "linux-aarch64": {
+        "pylon_sdks": ["7.5.0.15658"]
+    },
+    "windows": {
+        "pylon_sdks": ["7.5.0.15658"]
+    },
+    "macos": {
+        "pylon_sdks": ["7.3.1.0011"]
+    }
+}

.github/workflows/main.yml

@@ -1,5 +1,4 @@
-# This is a basic workflow to help you get started with Actions
-name: build
+name: Build pypylon
 
 # Controls when the action will run.
 on:
@@ -23,65 +22,82 @@ env:
   # TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}
 
 jobs:
-  prepare:
-    runs-on: ubuntu-22.04
-    outputs:
-      is_release_build: ${{ env.RELEASE_BUILD == '1' }}
+  setup:
+    runs-on: ubuntu-latest
     steps:
-      - name: Installer list
-        run: |
-          tee pylon-installer.txt <<"EOF"
-          ${PYLON_DOWNLOAD_URL_BASE_7_4}pylon_7.4.0.14900_linux_x86_64_setup.tar.gz
-          ${PYLON_DOWNLOAD_URL_BASE_7_4}pylon_7.4.0.14900_linux_aarch64_setup.tar.gz
-          ${PYLON_DOWNLOAD_URL_BASE}pylon_6.2.0.21487_armhf_setup.tar.gz
-          ${PYLON_DOWNLOAD_URL_BASE}pylon_7_3_1_0011.dmg
-          ${PYLON_DOWNLOAD_URL_BASE}basler_pylon_7_4_0_14900.exe
-          EOF
-      - uses: actions/cache@v3
-        id: cache
-        with:
-          path: pylon-installer
-          key: pylon-installer-${{ hashFiles('pylon-installer.txt') }}
+    - uses: jfrog/setup-jfrog-cli@v4
+      env:
+       JF_URL: ${{ secrets.SDK_URL }}
+       JF_ACCESS_TOKEN: ${{ secrets.SDK_TOKEN }}
+
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # login
+    - run: |
+        jf c add --url=$JF_URL --access-token=$JF_ACCESS_TOKEN --interactive=false
+
+    # download 
+    - name: Download files from Artifactory
+      id: get_sdks
+      run: |
+        set +x
+        set -e
+        build_config=$(cat .github/workflows/build_config.json)
+        for os in $(echo $build_config | jq -r 'keys[]'); do
+          for pylon_sdk in $(echo $build_config | jq -r --arg os "$os" '.[$os].pylon_sdks[]'); do
+            if [[ $os == "windows" || $os == "macos" ]]; then
+              jf rt dl --flat --props "pylon_os=${os,,};pylon_version=$pylon_sdk" "pylon-sdks-generic/*" ./${os,,}_sdk/
+            elif [[ $os == "linux-x86_64" ]]; then
+              jf rt dl --flat --props "pylon_architecture=x86_64;pylon_os=linux;pylon_version=$pylon_sdk" "pylon-sdks-generic/*" ./linux_x86_64_sdk/
+            elif [[ $os == "linux-aarch64" ]]; then
+              jf rt dl --flat --props "pylon_architecture=aarch64;pylon_os=linux;pylon_version=$pylon_sdk" "pylon-sdks-generic/*" ./linux_aarch64_sdk/
+            fi
+          done
+        done
+
+    - name: Upload Pylon SDK for Linux aarch64
+      uses: actions/upload-artifact@v4
+      with:
+        name: Linux_aarch64_Pylon
+        path: linux_aarch64_sdk
+
+    - name: Upload Pylon SDK for Linux x86_64
+      uses: actions/upload-artifact@v4
+      with:
+        name: Linux_x86_64_Pylon
+        path: linux_x86_64_sdk
 
-      - name: Fetch installers
-        if: steps.cache.outputs.cache-hit != 'true'
-        env:
-          PYLON_DOWNLOAD_URL_BASE: ${{ secrets.PYLON_DOWNLOAD_URL_BASE }}
-          PYLON_DOWNLOAD_URL_BASE_6_2: ${{ secrets.PYLON_DOWNLOAD_URL_BASE_6_2 }}
-          PYLON_DOWNLOAD_URL_BASE_6_3: ${{ secrets.PYLON_DOWNLOAD_URL_BASE_6_3 }}
-          PYLON_DOWNLOAD_URL_BASE_7_4: ${{ secrets.PYLON_DOWNLOAD_URL_BASE_7_4 }}
-          PYLON_DOWNLOAD_ARM64_URL_BASE: ${{ secrets.PYLON_DOWNLOAD_ARM64_URL_BASE }}
-        run: |
-          mkdir pylon-installer && cd pylon-installer
-          while read line; do
-            url=$(eval echo "$line")
-            echo "download $url"
-            curl -sSfL -O "$url"
-          done <../pylon-installer.txt
-          echo "Download result"
-          ls -l
-          md5sum *
+    - name: Upload Pylon SDK for Windows
+      uses: actions/upload-artifact@v4
+      with:
+        name: Windows_Pylon
+        path: windows_sdk
 
-      - uses: actions/upload-artifact@v3
-        with:
-          name: pylon-installer
-          path: pylon-installer
+    - name: Upload Pylon SDK for macOS
+      uses: actions/upload-artifact@v4
+      with:
+        name: macOS_Pylon
+        path: macos_sdk
 
-      - name: Check for release build
-        if: startsWith(github.ref, 'refs/tags/')
-        run: |
-          echo "Build release for $GITHUB_REF"
-          echo "RELEASE_BUILD=1" >> $GITHUB_ENV
+    - name: Check for release build
+      id: check_release_build
+      if: startsWith(github.ref, 'refs/tags/')
+      run: |
+        echo "Build release for $GITHUB_REF"
+        echo "release_build=1" >> $GITHUB_OUTPUT
 
+    outputs:
+      is_release_build: ${{ steps.check_release_build.outputs.env.release_build == '1' }}
 
   build-linux:
-    needs: prepare
-    runs-on: ubuntu-22.04
+    needs: setup
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        a: [cp36m, cp37m, cp38, cp39, cp3_10, cp3_11]
-        p: [manylinux_2_31_x86_64, manylinux_2_31_aarch64, manylinux_2_28_armv7l]
+        a: [cp39, cp3_10, cp3_11, cp3_12]
+        p: [manylinux_2_31_x86_64, manylinux_2_31_aarch64]
 
     env:
       P: ${{ matrix.p }}
@@ -90,15 +106,21 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - uses: actions/download-artifact@v3
+      # download the pylon sdks          
+      - name: download linux artifacts
+        uses: actions/download-artifact@v4
         with:
-          name: pylon-installer
+          pattern: Linux*Pylon
+          merge-multiple: true          
           path: pylon-installer
 
+      - name: Display Structure of downloaded files
+        run: ls -R pylon-installer
+
       - name: Build with docker
         run: |
           pwd
@@ -107,103 +129,106 @@ jobs:
           docker run --rm --privileged multiarch/qemu-user-static:register --reset
           ./scripts/build/build-arch.sh --platform-tag $P --abi-tag $A --pylon-dir ./pylon-installer $ARGS
 
+      # TODO: can we use v4 here?
       - uses: actions/upload-artifact@v3
         with:
           name: build-results-${{ matrix.p }}-${{ matrix.a }}
           path: dist/*
 
       - name: Upload Release Asset
-        if: needs.prepare.outputs.is_release_build == 'true'
+        if: needs.setup.outputs.is_release_build == 'true'
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           files: dist/*
 
       - name: Publish package to (Test)PyPI
-        if: needs.prepare.outputs.is_release_build == 'true' && startsWith( matrix.p, 'manylinux' )
+        if: needs.setup.outputs.is_release_build == 'true' && startsWith( matrix.p, 'manylinux' )
         run: |
           sudo pip3 install twine
           python3 -m twine upload --non-interactive --skip-existing dist/*
 
 
   build-windows:
-    needs: prepare
-    runs-on: windows-2019
+    needs: setup
+    runs-on: windows-latest
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.6 - 3.11"
+          python-version: "3.9 - 3.12"
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: pylon-installer
+          name: Windows_Pylon
           path: pylon-installer
 
+      - name: Display Structure of downloaded files
+        run: dir pylon-installer
+
       - name: Setup pylon
         run: |
           cd pylon-installer
-          basler_pylon_7_4_0_14900.exe /quiet /install="GigE_Support;USB_Support;Camera_Link_Support;CoaXPress_Support;GenTL_Consumer_Support;CamEmu_Support;SDKs;DataProcessing_SDK"
-        shell: cmd
+          ren Basler-pylon-*.exe Basler-pylon.exe
+          $process = Start-Process Basler-pylon.exe -Wait -ArgumentList '/quiet /install=GigE_Runtime;USB_Runtime;Camera_Link_Runtime;CoaXPress_Runtime;GenTL_Consumer_Support;CamEmu_Support;SDKs;DataProcessing_SDK' -PassThru
+          Write-Host "Process finished with return code:" $process.ExitCode
 
       - name: Build wheels
-        uses: pypa/[email protected]
-        env:
-          PYLON_DEV_DIR: "C:\\Program Files\\Basler\\pylon 7\\Development"
+        uses: pypa/[email protected]
 
       - uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
 
       - name: Upload Release Asset
-        if: needs.prepare.outputs.is_release_build == 'true'
+        if: needs.setup.outputs.is_release_build == 'true'
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           files: ./wheelhouse/*.whl
 
       - name: Publish package to (Test)PyPI
-        if: needs.prepare.outputs.is_release_build == 'true'
+        if: needs.setup.outputs.is_release_build == 'true'
         run: |
           python -m pip install twine
           python -m twine upload --non-interactive --skip-existing wheelhouse\\*
         shell: cmd
-          
+
 
   build-macos:
-    needs: prepare
-    runs-on: macos-11
+    needs: setup
+    runs-on: macos-latest
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.6 - 3.11"
+          python-version: "3.9 - 3.12"
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: pylon-installer
+          name: macOS_Pylon
           path: pylon-installer
 
       - name: Setup pylon
         run: |
           # install universal
           cd pylon-installer
-          hdiutil attach pylon_*.dmg
+          hdiutil attach pylon-*.dmg
           sudo installer -pkg /Volumes/pylon\ *\ Camera\ Software\ Suite/pylon-*.pkg  -target /
           hdiutil detach /Volumes/pylon\ *\ Camera\ Software\ Suite
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.13.0
+        uses: pypa/cibuildwheel@v2.19
         env:
           PYLON_FRAMEWORK_ARM64: /Library/Frameworks
           PYLON_FRAMEWORK_X86_64: /Library/Frameworks
@@ -213,32 +238,36 @@ jobs:
           path: ./wheelhouse/*.whl
 
       - name: Upload Release Asset
-        if: needs.prepare.outputs.is_release_build == 'true'
+        if: needs.setup.outputs.is_release_build == 'true'
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           files: ./wheelhouse/*.whl
 
       - name: Publish package to (Test)PyPI
-        if: needs.prepare.outputs.is_release_build == 'true'
+        if: needs.setup.outputs.is_release_build == 'true'
         run: |
           sudo pip3 install twine
           python3 -m twine upload --non-interactive --skip-existing wheelhouse/*
 
   cleanup:
     if: always()
     needs: [
-            prepare,
+            setup,
             build-linux,
             build-macos,
             build-windows
            ]
     runs-on: ubuntu-latest
     steps:
-    - uses: geekyeggo/delete-artifact@v2
+    - uses: geekyeggo/delete-artifact@v5
       continue-on-error: true
       with:
-        name: pylon-installer
+        name: |
+          Linux_x86_64_Pylon
+          Linux_aarch64_Pylon
+          Windows_Pylon
+          macOS_Pylon
 
 

pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=42", "swig>=4.2", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [tool.cibuildwheel]
-skip  = "pp*"
+skip = "pp* cp36-* cp37-* cp38-*"
 build-verbosity = "0"
 test-requires = "pytest numpy"