Node.js 16 to Node.js 20

koendv · May 13, 2024 · 47d15d7 · 47d15d7
1 parent 7e582b4
commit 47d15d7
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 27 deletions.
diff --git a/.github/workflows/build-current.yml b/.github/workflows/build-current.yml
@@ -20,7 +20,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: "blackmagic-debug/blackmagic"
 
@@ -37,7 +37,7 @@ jobs:
           mingw32-make PROBE_HOST=hosted HOSTED_BMP_ONLY=0
           zip -j9 bmda.zip src/blackmagic.exe 3rdparty/ftdi/amd64/ftd2xx.dll
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: bmda
           path: bmda.zip
@@ -49,7 +49,7 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: "blackmagic-debug/blackmagic"
 
@@ -60,7 +60,7 @@ jobs:
       - name: Report commit hash
         run: echo ${{ steps.getcommit.outputs.sha_short }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: "bmp"
 
@@ -83,7 +83,7 @@ jobs:
           mv src/artifacts/linux/blackmagic-hosted src/artifacts/linux/blackmagic
 
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: bmda
 

diff --git a/.github/workflows/build-memwatch.yml b/.github/workflows/build-memwatch.yml
@@ -23,7 +23,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: "blackmagic-debug/blackmagic"
 
@@ -45,7 +45,7 @@ jobs:
           mingw32-make PROBE_HOST=hosted HOSTED_BMP_ONLY=0 ENABLE_MEMWATCH=1
           zip -j9 bmda.zip src/blackmagic.exe 3rdparty/ftdi/amd64/ftd2xx.dll
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: bmda
           path: bmda.zip
@@ -57,7 +57,7 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: "blackmagic-debug/blackmagic"
 
@@ -73,7 +73,7 @@ jobs:
       - name: Report commit hash
         run: echo ${{ steps.getcommit.outputs.sha_short }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: "bmp"
 
@@ -96,7 +96,7 @@ jobs:
           mv src/artifacts/linux/blackmagic-hosted src/artifacts/linux/blackmagic
 
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: bmda
 

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -30,7 +30,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: "blackmagic-debug/blackmagic"
           ref: ${{ steps.upstream.outputs.tag_name }}
@@ -47,7 +47,7 @@ jobs:
           rm -fv /ucrt64/lib/libftdi1.dll.a /ucrt64/lib/libhidapi.dll.a /ucrt64/lib/libusb-1.0.dll.a
           mingw32-make PROBE_HOST=hosted HOSTED_BMP_ONLY=0
           zip -j9 bmda.zip src/blackmagic.exe 3rdparty/ftdi/amd64/ftd2xx.dll
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: bmda
           path: bmda.zip
@@ -68,12 +68,12 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: "blackmagic-debug/blackmagic"
           ref: ${{ steps.upstream.outputs.tag_name }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: "bmp"
 
@@ -95,7 +95,7 @@ jobs:
           mv src/artifacts/hosted/ src/artifacts/linux/
           mv src/artifacts/linux/blackmagic-hosted src/artifacts/linux/blackmagic
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: bmda
 

diff --git a/blackmagic.patch b/blackmagic.patch
@@ -1,10 +1,10 @@
 diff --git a/src/Makefile b/src/Makefile
-index 6740485f..e7115196 100644
+index 30503b23..86dc8926 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -192,8 +192,8 @@ all_platforms:
+@@ -217,8 +217,8 @@ all_platforms:
  	fi
- 	$(Q)$(MAKE) $(MFLAGS) -C ../libopencm3 lib/stm32/f1 lib/stm32/f4 lib/lm4f
+ 	$(Q)$(MAKE) $(MFLAGS) -C ../deps/libopencm3 lib/stm32/f1 lib/stm32/f4 lib/stm32/f7 lib/lm4f
  	$(Q)set -e ;\
 -	mkdir -p artifacts/$(shell git describe --always --dirty --tags) ;\
 -	echo "<html><body><ul>" > artifacts/index.html ;\
@@ -13,7 +13,7 @@ index 6740485f..e7115196 100644
  	$(MAKE) clean ;\
  	for i in platforms/*/Makefile.inc ; do \
  		export DIRNAME=`dirname $$i` ;\
-@@ -204,25 +204,33 @@ all_platforms:
+@@ -229,25 +229,33 @@ all_platforms:
  		export CFLAGS=-Werror ;\
  		echo "Building for hardware platform: $$PROBE_HOST" ;\
  		$(MAKE);\
@@ -59,7 +59,7 @@ index 6740485f..e7115196 100644
  command.c: include/version.h
 
 diff --git a/src/platforms/native/Makefile.inc b/src/platforms/native/Makefile.inc
-index 01d9245d..c6f590fe 100644
+index 4d10a46b..f649c301 100644
 --- a/src/platforms/native/Makefile.inc
 +++ b/src/platforms/native/Makefile.inc
 @@ -28,11 +28,15 @@ SRC +=               \
@@ -81,10 +81,10 @@ index 01d9245d..c6f590fe 100644
 -	-$(Q)$(RM) blackmagic.bin blackmagic_dfu blackmagic_dfu.bin blackmagic_dfu.hex
 +	-$(Q)$(RM) blackmagic.bin blackmagic_dfu blackmagic_dfu.bin blackmagic_dfu.hex blackmagic_allinone.bin
 diff --git a/src/platforms/stlink/Makefile.inc b/src/platforms/stlink/Makefile.inc
-index d10878a4..e3875fc9 100644
+index 89578755..cce4ce0b 100644
 --- a/src/platforms/stlink/Makefile.inc
 +++ b/src/platforms/stlink/Makefile.inc
-@@ -52,11 +52,15 @@ SRC +=          \
+@@ -56,11 +56,15 @@ SRC +=          \
  ifeq ($(ST_BOOTLOADER), 1)
  all:	blackmagic.bin
  else
@@ -102,7 +102,7 @@ index d10878a4..e3875fc9 100644
  host_clean:
  	-$(Q)$(RM) *.bin *elf *hex
 diff --git a/src/platforms/swlink/Makefile.inc b/src/platforms/swlink/Makefile.inc
-index f357602d..b928ad8c 100644
+index e14af9d7..a986fdc3 100644
 --- a/src/platforms/swlink/Makefile.inc
 +++ b/src/platforms/swlink/Makefile.inc
 @@ -28,11 +28,15 @@ SRC +=          \

diff --git a/flash128k.patch b/flash128k.patch
@@ -1,16 +1,16 @@
 diff --git a/src/Makefile b/src/Makefile
-index fc49839d..785a496e 100644
+index 30503b23..dee5d124 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -34,7 +34,6 @@ SRC =              \
- 	cortex.c       \
+@@ -43,7 +43,6 @@ SRC =              \
  	cortexm.c      \
  	crc32.c        \
+ 	ch579.c        \
 -	efm32.c        \
  	exception.c    \
  	gdb_if.c       \
  	gdb_main.c     \
-@@ -86,6 +85,11 @@ SRC =              \
+@@ -97,6 +96,11 @@ SRC =              \
  	target_flash.c \
  	target_probe.c