diff options
| author | Tim Newsome <tim@sifive.com> | 2021-08-30 15:03:59 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2021-08-30 15:03:59 -0700 |
| commit | a1146731a8a26207815b7540d2a26c52d67514c1 (patch) | |
| tree | 3e31558613f44bb910c3245b8e60886414e6a22b /.github | |
| parent | 13cfec45ccca35b3eb59631162147688c0127f8e (diff) | |
| parent | 9a9e9e2c666dcb4987421f89d3b09ff9951cb0a1 (diff) | |
| download | riscv-openocd-a1146731a8a26207815b7540d2a26c52d67514c1.zip riscv-openocd-a1146731a8a26207815b7540d2a26c52d67514c1.tar.gz riscv-openocd-a1146731a8a26207815b7540d2a26c52d67514c1.tar.bz2 | |
Merge branch 'master' into from_upstream
Conflicts:
src/flash/nor/fespi.c
src/jtag/drivers/ftdi.c
src/rtos/FreeRTOS.c
src/rtos/hwthread.c
src/rtos/rtos.c
src/rtos/rtos.h
src/rtos/rtos_ecos_stackings.c
src/rtos/rtos_embkernel_stackings.c
src/rtos/rtos_standard_stackings.c
src/rtos/rtos_standard_stackings.h
src/rtos/rtos_ucos_iii_stackings.c
src/server/gdb_server.c
src/server/server.c
src/target/riscv/riscv-013.c
src/target/target.c
src/target/target.h
Change-Id: If0924a3e799260c33fae5feb85975b1273b45a0f
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/snapshot.yml | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index b5a9e07..c53b194 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -22,7 +22,7 @@ jobs: - run: ./bootstrap - name: Prepare libusb1 env: - LIBUSB1_VER: 1.0.23 + LIBUSB1_VER: 1.0.24 run: | mkdir -p $DL_DIR && cd $DL_DIR wget "https://github.com/libusb/libusb/releases/download/v${LIBUSB1_VER}/libusb-${LIBUSB1_VER}.tar.bz2" @@ -30,7 +30,7 @@ jobs: echo "LIBUSB1_SRC=$PWD/libusb-${LIBUSB1_VER}" >> $GITHUB_ENV - name: Prepare hidapi env: - HIDAPI_VER: 0.9.0 + HIDAPI_VER: 0.10.1 run: | mkdir -p $DL_DIR && cd $DL_DIR wget "https://github.com/libusb/hidapi/archive/hidapi-${HIDAPI_VER}.tar.gz" @@ -38,14 +38,6 @@ jobs: cd hidapi-hidapi-${HIDAPI_VER} ./bootstrap echo "HIDAPI_SRC=$PWD" >> $GITHUB_ENV - - name: Prepare libftdi - env: - LIBFTDI_VER: 1.4 - run: | - mkdir -p $DL_DIR && cd $DL_DIR - wget "http://www.intra2net.com/en/developer/libftdi/download/libftdi1-${LIBFTDI_VER}.tar.bz2" - tar -xjf libftdi1-${LIBFTDI_VER}.tar.bz2 - echo "LIBFTDI_SRC=$PWD/libftdi1-${LIBFTDI_VER}" >> $GITHUB_ENV - name: Prepare capstone env: CAPSTONE_VER: 4.0.2 @@ -60,9 +52,8 @@ jobs: env: MAKE_JOBS: 2 HOST: i686-w64-mingw32 - LIBUSB1_CONFIG: --enable-shared --enable-static + LIBUSB1_CONFIG: --enable-shared --disable-static HIDAPI_CONFIG: --enable-shared --disable-static --disable-testgui - LIBFTDI_CONFIG: "-DCMAKE_TOOLCHAIN_FILE='${{ env.LIBFTDI_SRC }}/cmake/Toolchain-i686-w64-mingw32.cmake' -DBUILD_TESTS:BOOL=off -DFTDIPP:BOOL=off -DPYTHON_BINDINGS:BOOL=off -DEXAMPLES:BOOL=off -DDOCUMENTATION:BOOL=off -DFTDI_EEPROM:BOOL=off" CAPSTONE_CONFIG: "CAPSTONE_BUILD_CORE_ONLY=yes CAPSTONE_STATIC=yes CAPSTONE_SHARED=no" run: | # check if there is tag pointing at HEAD, otherwise take the HEAD SHA-1 as OPENOCD_TAG |