updating scripts

ikatson · Aug 27, 2024 · f332fc3 · f332fc3
1 parent fbf74c2
commit f332fc3
Showing 1 changed file with 11 additions and 18 deletions.
diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
@@ -39,31 +39,24 @@ jobs:
       - name: cross-compile all binaries
         # Building in a loop shows errors quicker and may be a bit faster as it's choking building 3
         # rust targets in parallel
-        run: mkdir -p target/cross && docker buildx ls &&
+        run: |
+          set -e
+          mkdir -p target/cross
+          docker buildx ls
+
           for platform in linux/arm/v7 linux/amd64 linux/arm64; do
-          mkdir -p target/cross/$platform &&
-          docker build --builder ${{ steps.builder1.outputs.name }}
-          --platform $platform
-          -f docker/Dockerfile.xx
-          --output type=local,dest=target/cross/$platform
-          .
+            mkdir -p target/cross/$platform
+            docker build --builder ${{ steps.builder1.outputs.name }} \
+              --platform $platform \
+              -f docker/Dockerfile.xx \
+              --output type=local,dest=target/cross/$platform \
+              .
           ;
           done
 
       - name: list files
         run: find target/cross/
 
-      # # linux_amd64/bin/rqbit -> linux/amd64/rqbit
-      # # linux_arm64/bin/rqbit -> linux/arm64/rqbit
-      # # linux_arm_v7/bin/rqbit -> linux/arm/v7/rqbit
-      # - name: Reorganize binaries in target/cross
-      #   run: find target/cross &
-      #     mkdir -p target/cross/linux/amd64/ target/cross/linux/arm64/ target/cross/linux/arm/v7 &&
-      #     cd target/cross/ &&
-      #     mv linux_amd64/bin/rqbit linux/amd64/ && chmod +x linux/amd64/rqbit &&
-      #     mv linux_arm64/bin/rqbit linux/arm64/ && chmod +x linux/arm64/rqbit &&
-      #     mv linux_arm_v7/bin/rqbit linux/arm/v7/ && chmod +x linux/arm/v7/rqbit
-
       # TODO: publish these as artifacts
 
       - name: Login to Docker Hub