debugging

raspberrypi · Nov 26, 2024 · e92a737 · e92a737
1 parent 401a0ac
commit e92a737
Show file tree

Hide file tree

Showing 2 changed files with 115 additions and 107 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,79 +7,79 @@ env:
   SKIP_RISCV: 1
 
 jobs:
-  build_windows:
-    name: Build Windows
-    # runs-on: [self-hosted, Windows, x64]
-    runs-on: 'windows-latest'
+  # build_windows:
+  #   name: Build Windows
+  #   # runs-on: [self-hosted, Windows, x64]
+  #   runs-on: 'windows-latest'
 
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup SSH Auth
-        if: runner.environment == 'github-hosted'
-        uses: webfactory/[email protected]
-        with:
-          ssh-private-key: ${{ secrets.SSH_KEY }}
-      - name: Build
-        run: ./build.ps1 ./config/x64-win.json -SkipSigning
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: tools-x64-win
-          path: |
-            bin/picotool-*-x64-win.zip
-            bin/pico-sdk-tools-*-x64-win.zip
-            bin/openocd-*-x64-win.zip
-      - name: Add Release Asset
-        uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          files: |
-            bin/picotool-*-x64-win.zip
-            bin/pico-sdk-tools-*-x64-win.zip
-            bin/openocd-*-x64-win.zip
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #     - name: Setup SSH Auth
+  #       if: runner.environment == 'github-hosted'
+  #       uses: webfactory/[email protected]
+  #       with:
+  #         ssh-private-key: ${{ secrets.SSH_KEY }}
+  #     - name: Build
+  #       run: ./build.ps1 ./config/x64-win.json -SkipSigning
+  #     - name: Upload Artifact
+  #       uses: actions/upload-artifact@v4
+  #       with:
+  #         name: tools-x64-win
+  #         path: |
+  #           bin/picotool-*-x64-win.zip
+  #           bin/pico-sdk-tools-*-x64-win.zip
+  #           bin/openocd-*-x64-win.zip
+  #     - name: Add Release Asset
+  #       uses: softprops/action-gh-release@v2
+  #       if: startsWith(github.ref, 'refs/tags/')
+  #       with:
+  #         files: |
+  #           bin/picotool-*-x64-win.zip
+  #           bin/pico-sdk-tools-*-x64-win.zip
+  #           bin/openocd-*-x64-win.zip
 
-  build_macos:
-    name: Build MacOS
-    # runs-on: [self-hosted, macOS]
-    runs-on: 'macos-latest'
+  # build_macos:
+  #   name: Build MacOS
+  #   # runs-on: [self-hosted, macOS]
+  #   runs-on: 'macos-latest'
 
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Homebrew
-        if: runner.environment == 'github-hosted'
-        id: set-up-homebrew
-        uses: Homebrew/actions/setup-homebrew@master
-      - name: Set up x86_64 Homebrew
-        if: runner.environment == 'github-hosted'
-        run: |
-          NONINTERACTIVE=1 arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-      - name: Setup SSH Auth
-        if: runner.environment == 'github-hosted'
-        uses: webfactory/[email protected]
-        with:
-          ssh-private-key: ${{ secrets.SSH_KEY }}
-      - name: Build
-        run: ./build_macos.sh
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: tools-mac
-          path: |
-            bin/picotool-*-mac.zip
-            bin/pico-sdk-tools-*-mac.zip
-            bin/openocd-*-mac.zip
-            bin/riscv-toolchain-*.zip
-      - name: Add Release Asset
-        uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          files: |
-            bin/picotool-*-mac.zip
-            bin/pico-sdk-tools-*-mac.zip
-            bin/openocd-*-mac.zip
-            bin/riscv-toolchain-*.zip
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #     - name: Set up Homebrew
+  #       if: runner.environment == 'github-hosted'
+  #       id: set-up-homebrew
+  #       uses: Homebrew/actions/setup-homebrew@master
+  #     - name: Set up x86_64 Homebrew
+  #       if: runner.environment == 'github-hosted'
+  #       run: |
+  #         NONINTERACTIVE=1 arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+  #     - name: Setup SSH Auth
+  #       if: runner.environment == 'github-hosted'
+  #       uses: webfactory/[email protected]
+  #       with:
+  #         ssh-private-key: ${{ secrets.SSH_KEY }}
+  #     - name: Build
+  #       run: ./build_macos.sh
+  #     - name: Upload Artifact
+  #       uses: actions/upload-artifact@v4
+  #       with:
+  #         name: tools-mac
+  #         path: |
+  #           bin/picotool-*-mac.zip
+  #           bin/pico-sdk-tools-*-mac.zip
+  #           bin/openocd-*-mac.zip
+  #           bin/riscv-toolchain-*.zip
+  #     - name: Add Release Asset
+  #       uses: softprops/action-gh-release@v2
+  #       if: startsWith(github.ref, 'refs/tags/')
+  #       with:
+  #         files: |
+  #           bin/picotool-*-mac.zip
+  #           bin/pico-sdk-tools-*-mac.zip
+  #           bin/openocd-*-mac.zip
+  #           bin/riscv-toolchain-*.zip
 
   build_macos_intel:
     name: Build Intel MacOS
@@ -115,41 +115,41 @@ jobs:
             bin/openocd-*-mac.zip
             bin/riscv-toolchain-*.zip
 
-  build_linux:
-    name: Build Linux
-    # strategy:
-    #   matrix:
-    #     os: [[self-hosted, linux, x64], [self-hosted, linux, arm64]]
-    strategy:
-      matrix:
-        os: [ubuntu-latest, [self-hosted, linux, arm64]]
-    runs-on: ${{ matrix.os }}
+  # build_linux:
+  #   name: Build Linux
+  #   # strategy:
+  #   #   matrix:
+  #   #     os: [[self-hosted, linux, x64], [self-hosted, linux, arm64]]
+  #   strategy:
+  #     matrix:
+  #       os: [ubuntu-latest, [self-hosted, linux, arm64]]
+  #   runs-on: ${{ matrix.os }}
 
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup SSH Auth
-        if: runner.environment == 'github-hosted'
-        uses: webfactory/[email protected]
-        with:
-          ssh-private-key: ${{ secrets.SSH_KEY }}
-      - name: Build
-        run: ./build_linux.sh
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: tools-lin-${{ runner.arch }}
-          path: |
-            bin/picotool-*-lin.tar.gz
-            bin/pico-sdk-tools-*-lin.tar.gz
-            bin/openocd-*-lin.tar.gz
-            bin/riscv-toolchain-*-lin.tar.gz
-      - name: Add Release Asset
-        uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          files: |
-            bin/picotool-*-lin.tar.gz
-            bin/pico-sdk-tools-*-lin.tar.gz
-            bin/openocd-*-lin.tar.gz
-            bin/riscv-toolchain-*-lin.tar.gz
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #     - name: Setup SSH Auth
+  #       if: runner.environment == 'github-hosted'
+  #       uses: webfactory/[email protected]
+  #       with:
+  #         ssh-private-key: ${{ secrets.SSH_KEY }}
+  #     - name: Build
+  #       run: ./build_linux.sh
+  #     - name: Upload Artifact
+  #       uses: actions/upload-artifact@v4
+  #       with:
+  #         name: tools-lin-${{ runner.arch }}
+  #         path: |
+  #           bin/picotool-*-lin.tar.gz
+  #           bin/pico-sdk-tools-*-lin.tar.gz
+  #           bin/openocd-*-lin.tar.gz
+  #           bin/riscv-toolchain-*-lin.tar.gz
+  #     - name: Add Release Asset
+  #       uses: softprops/action-gh-release@v2
+  #       if: startsWith(github.ref, 'refs/tags/')
+  #       with:
+  #         files: |
+  #           bin/picotool-*-lin.tar.gz
+  #           bin/pico-sdk-tools-*-lin.tar.gz
+  #           bin/openocd-*-lin.tar.gz
+  #           bin/riscv-toolchain-*-lin.tar.gz
diff --git a/build_macos_intel.sh b/build_macos_intel.sh
@@ -49,6 +49,8 @@ if [[ "$SKIP_OPENOCD" != 1 ]]; then
     if ! ../packages/macos/openocd/build-openocd.sh; then
         echo "OpenOCD Build failed"
         SKIP_OPENOCD=1
+    else
+        echo "OpenOCD Build Succeeded"
     fi
 fi
 if [[ "$SKIP_RISCV" != 1 ]]; then
@@ -60,6 +62,12 @@ topd=$PWD
 if [[ "$SKIP_OPENOCD" != 1 ]]; then
     # Package OpenOCD separately as well
 
+    ls $builddir
+    ls $builddir/openocd-install
+    ls $builddir/openocd-install/usr
+    ls $builddir/openocd-install/usr/local
+    ls $builddir/openocd-install/usr/local/bin
+
     version=($("./$builddir/openocd-install/usr/local/bin/openocd" --version 2>&1))
     version=${version[0]}
     version=${version[3]}