Skip to content

Commit 4e90511

Browse files
sobucherhankur
authored andcommitted
.github: install libjim for build jobs
1 parent de7f3d2 commit 4e90511

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

.github/actions/common-build-steps/action.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,17 @@ runs:
6767
popd
6868
fi
6969
70+
# JIMTCL
71+
export JIMTCL_VER=jimtcl-0.83
72+
cd $DL_DIR && wget https://dl.espressif.com/dl/$JIMTCL_VER.tar.gz -O $JIMTCL_VER.tar.gz
73+
tar xzf $JIMTCL_VER.tar.gz && rm $JIMTCL_VER.tar.gz && pushd $JIMTCL_VER
74+
./configure --prefix="$PREFIX" --host=${CONF_HOST} --disable-shared CC=${HOST_CC}
75+
make
76+
# Running "make" does not create this file for static builds on Windows but "make install" still expects it
77+
touch build-jim-ext
78+
make install
79+
popd
80+
7081
cd $PREFIX/../..
7182
./bootstrap
7283
./configure --prefix="$PREFIX/openocd" --host=${CONF_HOST} $OPENOCD_CONFIGURE_OPTS CC=${HOST_CC}
@@ -75,6 +86,7 @@ runs:
7586
7687
if [[ $ARCH == "windows" ]]; then
7788
cp $PREFIX/lib/zlib1.dll $PREFIX/openocd/bin
89+
cp `$HOST_CC --print-file-name=libgcc_s_dw2-1.dll` $PREFIX/openocd/bin/
7890
fi
7991
8092
echo "ARTIFACT_PATH=$PREFIX/openocd" >> $GITHUB_ENV

.github/workflows/build_openocd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
arch: macos-arm64
4141

4242
build-linux:
43-
runs-on: ubuntu-20.04
43+
runs-on: ubuntu-22.04
4444
steps:
4545
- uses: actions/checkout@v4
4646
- name: install deps
@@ -51,7 +51,7 @@ jobs:
5151
arch: linux
5252

5353
build-windows:
54-
runs-on: ubuntu-20.04
54+
runs-on: ubuntu-22.04
5555
steps:
5656
- uses: actions/checkout@v4
5757
- name: install deps

.github/workflows/test_openocd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
run-linux-host:
4242
name: Test OpenOCD on Linux
43-
runs-on: ubuntu-20.04
43+
runs-on: ubuntu-22.04
4444
steps:
4545
- name: Checkout repository
4646
uses: actions/checkout@v4

0 commit comments

Comments
 (0)