diff options
| author | Tim Newsome <tim@sifive.com> | 2023-10-16 12:30:06 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2023-10-16 12:30:06 -0700 |
| commit | 53fcf14d83481c6713396dfe8e30067c3c82cac1 (patch) | |
| tree | 94a4d86ae529a3a574485f00f5bf806f0d716607 /.github | |
| parent | e1fa78d1b368bfd0c9493897da4052534778c79e (diff) | |
| parent | 0384fe5d596f42388f8b84d42959d899f29388ab (diff) | |
| download | riscv-openocd-53fcf14d83481c6713396dfe8e30067c3c82cac1.zip riscv-openocd-53fcf14d83481c6713396dfe8e30067c3c82cac1.tar.gz riscv-openocd-53fcf14d83481c6713396dfe8e30067c3c82cac1.tar.bz2 | |
Merge commit '0384fe5d596f42388f8b84d42959d899f29388ab' into from_upstream
Conflicts:
.github/workflows/snapshot.yml
src/rtos/FreeRTOS.c
Change-Id: I4c9ff887b69140e0f61cb3f75a2f2c1a12071320
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/snapshot.yml | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 6cbce86..71bfecc 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -30,7 +30,7 @@ jobs: echo "LIBUSB1_SRC=$PWD/libusb-${LIBUSB1_VER}" >> $GITHUB_ENV - name: Prepare hidapi env: - HIDAPI_VER: 0.11.2 + HIDAPI_VER: 0.13.1 run: | mkdir -p $DL_DIR && cd $DL_DIR wget "https://github.com/libusb/hidapi/archive/hidapi-${HIDAPI_VER}.tar.gz" @@ -56,6 +56,16 @@ jobs: wget "https://github.com/aquynh/capstone/archive/${CAPSTONE_VER}.tar.gz" tar -xzf ${CAPSTONE_VER}.tar.gz echo "CAPSTONE_SRC=$PWD/capstone-${CAPSTONE_VER}" >> $GITHUB_ENV + - name: Prepare libjaylink + env: + LIBJAYLINK_VER: 0.3.1 + run: | + mkdir -p $DL_DIR && cd $DL_DIR + wget https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${LIBJAYLINK_VER}/libjaylink-${LIBJAYLINK_VER}.tar.gz + tar -xzf libjaylink-${LIBJAYLINK_VER}.tar.gz + cd libjaylink-${LIBJAYLINK_VER} + ./autogen.sh + echo "LIBJAYLINK_SRC=$PWD" >> $GITHUB_ENV - name: Package OpenOCD for windows env: MAKE_JOBS: 2 @@ -65,6 +75,7 @@ jobs: LIBFTDI_CONFIG: -DSTATICLIBS=OFF -DEXAMPLES=OFF -DFTDI_EEPROM=OFF CAPSTONE_CONFIG: "CAPSTONE_BUILD_CORE_ONLY=yes CAPSTONE_STATIC=yes CAPSTONE_SHARED=no" CAPSTONE_CFLAGS: -I$(CAPSTONE_SRC)/include/capstone + LIBJAYLINK_CONFIG: --enable-shared --disable-static run: | # check if there is tag pointing at HEAD, otherwise take the HEAD SHA-1 as OPENOCD_TAG OPENOCD_TAG="`git tag --points-at HEAD`" @@ -83,6 +94,7 @@ jobs: # add missing dlls cd $HOST-root/usr cp `$HOST-gcc --print-file-name=libwinpthread-1.dll` ./bin/ + # required by libftdi1.dll. For the gcc-mingw-10.3.x or later "libgcc_s_dw2-1.dll" will need to be copied. cp `$HOST-gcc --print-file-name=libgcc_s_sjlj-1.dll` ./bin/ # prepare the artifact ARTIFACT="openocd-${OPENOCD_TAG}-${HOST}.tar.gz" @@ -92,7 +104,23 @@ jobs: echo "ARTIFACT_PATH=$PWD/$ARTIFACT" >> $GITHUB_ENV echo "ARTIFACT_NAME=openocd-windows-${OPENOCD_TAG}" >> $GITHUB_ENV - name: Publish OpenOCD packaged for windows - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: ${{ env.ARTIFACT_NAME }} path: ${{ env.ARTIFACT_PATH }} + - name: Delete 'latest' Release + uses: dev-drprasad/delete-tag-and-release@v0.2.1 + with: + delete_release: true + tag_name: ${{ env.RELEASE_NAME }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Create Release + uses: ncipollo/release-action@v1 + with: + tag: ${{ env.RELEASE_NAME }} + commit: ${{ github.sha }} + draft: false + artifacts: ${{ env.ARTIFACT_PATH }} + prerelease: ${{ env.IS_PRE_RELEASE }} + token: ${{ secrets.GITHUB_TOKEN }} |