Skip to content

Commit e92a737

Browse files
will-v-piwill-v-pi
committed
debugging
1 parent 401a0ac commit e92a737

File tree

2 files changed

+115
-107
lines changed

2 files changed

+115
-107
lines changed

‎.github/workflows/build.yml‎

Lines changed: 107 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -7,79 +7,79 @@ env:
77
SKIP_RISCV: 1
88

99
jobs:
10-
build_windows:
11-
name: Build Windows
12-
# runs-on: [self-hosted, Windows, x64]
13-
runs-on: 'windows-latest'
10+
# build_windows:
11+
# name: Build Windows
12+
# # runs-on: [self-hosted, Windows, x64]
13+
# runs-on: 'windows-latest'
1414

15-
steps:
16-
- name: Checkout
17-
uses: actions/checkout@v4
18-
- name: Setup SSH Auth
19-
if: runner.environment == 'github-hosted'
20-
uses: webfactory/[email protected]
21-
with:
22-
ssh-private-key: ${{ secrets.SSH_KEY }}
23-
- name: Build
24-
run: ./build.ps1 ./config/x64-win.json -SkipSigning
25-
- name: Upload Artifact
26-
uses: actions/upload-artifact@v4
27-
with:
28-
name: tools-x64-win
29-
path: |
30-
bin/picotool-*-x64-win.zip
31-
bin/pico-sdk-tools-*-x64-win.zip
32-
bin/openocd-*-x64-win.zip
33-
- name: Add Release Asset
34-
uses: softprops/action-gh-release@v2
35-
if: startsWith(github.ref, 'refs/tags/')
36-
with:
37-
files: |
38-
bin/picotool-*-x64-win.zip
39-
bin/pico-sdk-tools-*-x64-win.zip
40-
bin/openocd-*-x64-win.zip
15+
# steps:
16+
# - name: Checkout
17+
# uses: actions/checkout@v4
18+
# - name: Setup SSH Auth
19+
# if: runner.environment == 'github-hosted'
20+
# uses: webfactory/[email protected]
21+
# with:
22+
# ssh-private-key: ${{ secrets.SSH_KEY }}
23+
# - name: Build
24+
# run: ./build.ps1 ./config/x64-win.json -SkipSigning
25+
# - name: Upload Artifact
26+
# uses: actions/upload-artifact@v4
27+
# with:
28+
# name: tools-x64-win
29+
# path: |
30+
# bin/picotool-*-x64-win.zip
31+
# bin/pico-sdk-tools-*-x64-win.zip
32+
# bin/openocd-*-x64-win.zip
33+
# - name: Add Release Asset
34+
# uses: softprops/action-gh-release@v2
35+
# if: startsWith(github.ref, 'refs/tags/')
36+
# with:
37+
# files: |
38+
# bin/picotool-*-x64-win.zip
39+
# bin/pico-sdk-tools-*-x64-win.zip
40+
# bin/openocd-*-x64-win.zip
4141

42-
build_macos:
43-
name: Build MacOS
44-
# runs-on: [self-hosted, macOS]
45-
runs-on: 'macos-latest'
42+
# build_macos:
43+
# name: Build MacOS
44+
# # runs-on: [self-hosted, macOS]
45+
# runs-on: 'macos-latest'
4646

47-
steps:
48-
- name: Checkout
49-
uses: actions/checkout@v4
50-
- name: Set up Homebrew
51-
if: runner.environment == 'github-hosted'
52-
id: set-up-homebrew
53-
uses: Homebrew/actions/setup-homebrew@master
54-
- name: Set up x86_64 Homebrew
55-
if: runner.environment == 'github-hosted'
56-
run: |
57-
NONINTERACTIVE=1 arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
58-
- name: Setup SSH Auth
59-
if: runner.environment == 'github-hosted'
60-
uses: webfactory/[email protected]
61-
with:
62-
ssh-private-key: ${{ secrets.SSH_KEY }}
63-
- name: Build
64-
run: ./build_macos.sh
65-
- name: Upload Artifact
66-
uses: actions/upload-artifact@v4
67-
with:
68-
name: tools-mac
69-
path: |
70-
bin/picotool-*-mac.zip
71-
bin/pico-sdk-tools-*-mac.zip
72-
bin/openocd-*-mac.zip
73-
bin/riscv-toolchain-*.zip
74-
- name: Add Release Asset
75-
uses: softprops/action-gh-release@v2
76-
if: startsWith(github.ref, 'refs/tags/')
77-
with:
78-
files: |
79-
bin/picotool-*-mac.zip
80-
bin/pico-sdk-tools-*-mac.zip
81-
bin/openocd-*-mac.zip
82-
bin/riscv-toolchain-*.zip
47+
# steps:
48+
# - name: Checkout
49+
# uses: actions/checkout@v4
50+
# - name: Set up Homebrew
51+
# if: runner.environment == 'github-hosted'
52+
# id: set-up-homebrew
53+
# uses: Homebrew/actions/setup-homebrew@master
54+
# - name: Set up x86_64 Homebrew
55+
# if: runner.environment == 'github-hosted'
56+
# run: |
57+
# NONINTERACTIVE=1 arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
58+
# - name: Setup SSH Auth
59+
# if: runner.environment == 'github-hosted'
60+
# uses: webfactory/[email protected]
61+
# with:
62+
# ssh-private-key: ${{ secrets.SSH_KEY }}
63+
# - name: Build
64+
# run: ./build_macos.sh
65+
# - name: Upload Artifact
66+
# uses: actions/upload-artifact@v4
67+
# with:
68+
# name: tools-mac
69+
# path: |
70+
# bin/picotool-*-mac.zip
71+
# bin/pico-sdk-tools-*-mac.zip
72+
# bin/openocd-*-mac.zip
73+
# bin/riscv-toolchain-*.zip
74+
# - name: Add Release Asset
75+
# uses: softprops/action-gh-release@v2
76+
# if: startsWith(github.ref, 'refs/tags/')
77+
# with:
78+
# files: |
79+
# bin/picotool-*-mac.zip
80+
# bin/pico-sdk-tools-*-mac.zip
81+
# bin/openocd-*-mac.zip
82+
# bin/riscv-toolchain-*.zip
8383

8484
build_macos_intel:
8585
name: Build Intel MacOS
@@ -115,41 +115,41 @@ jobs:
115115
bin/openocd-*-mac.zip
116116
bin/riscv-toolchain-*.zip
117117
118-
build_linux:
119-
name: Build Linux
120-
# strategy:
121-
# matrix:
122-
# os: [[self-hosted, linux, x64], [self-hosted, linux, arm64]]
123-
strategy:
124-
matrix:
125-
os: [ubuntu-latest, [self-hosted, linux, arm64]]
126-
runs-on: ${{ matrix.os }}
118+
# build_linux:
119+
# name: Build Linux
120+
# # strategy:
121+
# # matrix:
122+
# # os: [[self-hosted, linux, x64], [self-hosted, linux, arm64]]
123+
# strategy:
124+
# matrix:
125+
# os: [ubuntu-latest, [self-hosted, linux, arm64]]
126+
# runs-on: ${{ matrix.os }}
127127

128-
steps:
129-
- name: Checkout
130-
uses: actions/checkout@v4
131-
- name: Setup SSH Auth
132-
if: runner.environment == 'github-hosted'
133-
uses: webfactory/[email protected]
134-
with:
135-
ssh-private-key: ${{ secrets.SSH_KEY }}
136-
- name: Build
137-
run: ./build_linux.sh
138-
- name: Upload Artifact
139-
uses: actions/upload-artifact@v4
140-
with:
141-
name: tools-lin-${{ runner.arch }}
142-
path: |
143-
bin/picotool-*-lin.tar.gz
144-
bin/pico-sdk-tools-*-lin.tar.gz
145-
bin/openocd-*-lin.tar.gz
146-
bin/riscv-toolchain-*-lin.tar.gz
147-
- name: Add Release Asset
148-
uses: softprops/action-gh-release@v2
149-
if: startsWith(github.ref, 'refs/tags/')
150-
with:
151-
files: |
152-
bin/picotool-*-lin.tar.gz
153-
bin/pico-sdk-tools-*-lin.tar.gz
154-
bin/openocd-*-lin.tar.gz
155-
bin/riscv-toolchain-*-lin.tar.gz
128+
# steps:
129+
# - name: Checkout
130+
# uses: actions/checkout@v4
131+
# - name: Setup SSH Auth
132+
# if: runner.environment == 'github-hosted'
133+
# uses: webfactory/[email protected]
134+
# with:
135+
# ssh-private-key: ${{ secrets.SSH_KEY }}
136+
# - name: Build
137+
# run: ./build_linux.sh
138+
# - name: Upload Artifact
139+
# uses: actions/upload-artifact@v4
140+
# with:
141+
# name: tools-lin-${{ runner.arch }}
142+
# path: |
143+
# bin/picotool-*-lin.tar.gz
144+
# bin/pico-sdk-tools-*-lin.tar.gz
145+
# bin/openocd-*-lin.tar.gz
146+
# bin/riscv-toolchain-*-lin.tar.gz
147+
# - name: Add Release Asset
148+
# uses: softprops/action-gh-release@v2
149+
# if: startsWith(github.ref, 'refs/tags/')
150+
# with:
151+
# files: |
152+
# bin/picotool-*-lin.tar.gz
153+
# bin/pico-sdk-tools-*-lin.tar.gz
154+
# bin/openocd-*-lin.tar.gz
155+
# bin/riscv-toolchain-*-lin.tar.gz

‎build_macos_intel.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ if [[ "$SKIP_OPENOCD" != 1 ]]; then
4949
if ! ../packages/macos/openocd/build-openocd.sh; then
5050
echo "OpenOCD Build failed"
5151
SKIP_OPENOCD=1
52+
else
53+
echo "OpenOCD Build Succeeded"
5254
fi
5355
fi
5456
if [[ "$SKIP_RISCV" != 1 ]]; then
@@ -60,6 +62,12 @@ topd=$PWD
6062
if [[ "$SKIP_OPENOCD" != 1 ]]; then
6163
# Package OpenOCD separately as well
6264

65+
ls $builddir
66+
ls $builddir/openocd-install
67+
ls $builddir/openocd-install/usr
68+
ls $builddir/openocd-install/usr/local
69+
ls $builddir/openocd-install/usr/local/bin
70+
6371
version=($("./$builddir/openocd-install/usr/local/bin/openocd" --version 2>&1))
6472
version=${version[0]}
6573
version=${version[3]}

0 commit comments

Comments
 (0)