WIP: check downloader

basler · Jun 14, 2024 · 3769fce · 3769fce
1 parent 079c9cb
commit 3769fce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 23 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -111,17 +111,15 @@ jobs:
           fetch-depth: 0
 
       # download the pylon sdks          
-      - name: download x86_64
+      - name: download linux artifacts
         uses: actions/download-artifact@v4
         with:
-          name: Linux_x86_64_Pylon
+          pattern: Linux*Pylon
+          merge-multiple: true          
           path: pylon-installer
 
-      - name: download aarch64
-        uses: actions/download-artifact@v4
-        with:
-          name: Linux_aarch64_Pylon
-          path: pylon-installer          
+      - name: Display Structure of downloaded files
+        run: ls -R pylon-installer
 
       - name: Build with docker
         run: |
@@ -170,12 +168,14 @@ jobs:
           name: Windows_Pylon
           path: pylon-installer
 
+      - name: Display Structure of downloaded files
+        run: dir pylon-installer
+
       - name: Setup pylon
         run: |
           cd pylon-installer
-          # assert that we only have one installer
-          [ $(ls Basler-pylon-*.exe 2>/dev/null | wc -l) -eq 1 ] || echo "Error: Expected exactly one file, but found $(ls Basler-pylon-*.exe 2>/dev/null | wc -l)" && exit 1
-          Basler-pylon-*.exe /quiet /install="GigE_Support;USB_Support;Camera_Link_Support;CoaXPress_Support;GenTL_Consumer_Support;CamEmu_Support;SDKs;DataProcessing_SDK"
+          move Basler-pylon-*.exe Basler-pylon.exe
+          Basler-pylon.exe /quiet /install="GigE_Support;USB_Support;Camera_Link_Support;CoaXPress_Support;GenTL_Consumer_Support;CamEmu_Support;SDKs;DataProcessing_SDK"
         shell: cmd
 
       - name: Build wheels

diff --git a/scripts/build/build-arch.sh b/scripts/build/build-arch.sh
@@ -108,21 +108,9 @@ if [ -z "$PYLON_DIR" ]; then
 fi
 
 #test for pylon 6.1
-files=( $PYLON_DIR/pylon_*_${PYLON_ARCH}_setup.tar.gz )
+files=( $PYLON_DIR/pylon-*-${PYLON_ARCH}_setup.tar.gz )
 PYLON="${files[0]}"
 
-#fallback to pre 6.1 naming
-if [ ! -f "$PYLON" ]; then
-    files=( $PYLON_DIR/pylon-*-$PYLON_ARCH.tar.gz )
-    PYLON="${files[0]}"
-
-    #special case for pylon 5.x where aarch64 was named arm64
-    if [ ! -f "$PYLON" -a $PYLON_ARCH == "aarch64" ]; then
-        files=( $PYLON_DIR/pylon-*-arm64.tar.gz )
-        PYLON="${files[0]}"
-    fi
-fi
-
 if [ ! -f "$PYLON" ]; then
     echo "Couldn't find pylon installer in $PYLON_DIR"
     exit 1