Skip to content

Commit 10e3679

Browse files
erhankurstephanosio
authored andcommitted
github/workflow: increase delete-tag-and-release version
During setup job in the GH actions, GH tries to resolve all actions before starting to run the scripts. It can not find 0.2.0 version inside 'dev-drprasad/delete-tag-and-release 'repo and action fails. This patch fixes that error. Also, switched to the latest ubuntu image Hidapi version updated to 0.13.1 Signed-off-by: Erhan Kurubas <erhan.kurubas@espressif.com> Change-Id: I02af41f6189d5a28f874c9b008073d74de46b4ca Reviewed-on: https://review.openocd.org/c/openocd/+/7551 Tested-by: jenkins Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com> (cherry picked from commit 4b9b55a) Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
1 parent e2b6f56 commit 10e3679

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

.github/workflows/snapshot.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ name: OpenOCD Snapshot
88

99
jobs:
1010
package:
11-
runs-on: [ubuntu-18.04]
11+
runs-on: [ubuntu-20.04]
1212
env:
1313
DL_DIR: ../downloads
1414
BUILD_DIR: ../build
@@ -30,7 +30,7 @@ jobs:
3030
echo "LIBUSB1_SRC=$PWD/libusb-${LIBUSB1_VER}" >> $GITHUB_ENV
3131
- name: Prepare hidapi
3232
env:
33-
HIDAPI_VER: 0.11.2
33+
HIDAPI_VER: 0.13.1
3434
run: |
3535
mkdir -p $DL_DIR && cd $DL_DIR
3636
wget "https://github.com/libusb/hidapi/archive/hidapi-${HIDAPI_VER}.tar.gz"
@@ -82,6 +82,7 @@ jobs:
8282
# add missing dlls
8383
cd $HOST-root/usr
8484
cp `$HOST-gcc --print-file-name=libwinpthread-1.dll` ./bin/
85+
# required by libftdi1.dll. For the gcc-mingw-10.3.x or later "libgcc_s_dw2-1.dll" will need to be copied.
8586
cp `$HOST-gcc --print-file-name=libgcc_s_sjlj-1.dll` ./bin/
8687
# prepare the artifact
8788
ARTIFACT="openocd-${OPENOCD_TAG}-${HOST}.tar.gz"
@@ -90,11 +91,11 @@ jobs:
9091
echo "IS_PRE_RELEASE=$IS_PRE_RELEASE" >> $GITHUB_ENV
9192
echo "ARTIFACT_PATH=$PWD/$ARTIFACT" >> $GITHUB_ENV
9293
- name: Publish OpenOCD packaged for windows
93-
uses: actions/upload-artifact@v2
94+
uses: actions/upload-artifact@v3
9495
with:
9596
path: ${{ env.ARTIFACT_PATH }}
9697
- name: Delete 'latest' Release
97-
uses: dev-drprasad/delete-tag-and-release@v0.2.0
98+
uses: dev-drprasad/delete-tag-and-release@v0.2.1
9899
with:
99100
delete_release: true
100101
tag_name: ${{ env.RELEASE_NAME }}

0 commit comments

Comments
 (0)