fix: use github token in pack-examples action

curl seems to be blocked by github unless we use our api token
dyne · Dec 28, 2024 · a7d405b · a7d405b
1 parent 04da0b5
commit a7d405b
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 20 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -204,6 +204,8 @@ jobs:
           bash build/pack-examples.sh
           mkdir -p cjit-bin/release-demo/
           mv cjit-demo.tar.gz cjit-bin/release-demo/
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: show release directory structure
         run: tree -dL 3
       - name: relase all binary artifacts

diff --git a/build/pack-examples.sh b/build/pack-examples.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-#set -x
+set -x
 
 # this script is designed to run on GNU/Linux
 # it will generate a cjit-demo archive usable on all platforms
@@ -11,12 +11,22 @@ function fetch() {
 	}
 	out="$1"
 	url="$2"
-	mkdir -p ${odir}
+	REPO_OWNER="$3"
+	REPO_NAME="$4"
+	TAG="$5"
+	FILE_NAME="$out"
 	if [ -r ${odir}/${out} ]; then
 			>&2 echo "Found   : ${odir}/${out}"
 	else
 		>&2 echo "Download: ${odir}/${out}"
-		curl -sL --output ${odir}/${out} ${url}
+		if [ "$GITHUB_ACTIONS" == "true" ]; then
+			API_URL="https://api.github.com/repos/$REPO_OWNER/$REPO_NAME/releases/tags/$TAG"
+			DOWNLOAD_URL=$(curl -s -H "Authorization: token $GITHUB_TOKEN" $API_URL | jq -r ".assets[] | select(.name==\"$FILE_NAME\") | .browser_download_url")
+			curl -L -H "Authorization: token $GITHUB_TOKEN" \
+				 --output ${odir}/$FILE_NAME $DOWNLOAD_URL
+		else
+			curl -sL --output ${odir}/${out} ${url}
+		fi
 	fi
 }
 
@@ -25,68 +35,79 @@ mkdir -p cjit-demo/include
 cp -ra examples cjit-demo/
 
 odir=dl
+mkdir -p ${odir}
 
-fetch dmon.h    https://raw.githubusercontent.com/septag/dmon/master/dmon.h
+[ -r ${odir}/dmon.h ] ||
+	curl -L --output ${odir}/dmon.h https://raw.githubusercontent.com/septag/dmon/master/dmon.h
 cp dl/dmon.h cjit-demo/include/
-fetch nuklear.h https://raw.githubusercontent.com/Immediate-Mode-UI/Nuklear/master/nuklear.h
+[ -r ${odir}/nuklear.h ] ||
+    curl -L --output ${odir}/nuklear.h https://raw.githubusercontent.com/Immediate-Mode-UI/Nuklear/master/nuklear.h
 cp dl/nuklear.h cjit-demo/include
-fetch miniaudio.h https://raw.githubusercontent.com/mackron/miniaudio/master/miniaudio.h
+[ -r ${odir}/miniaudio.h ] ||
+	curl -L --output ${odir}/miniaudio.h https://raw.githubusercontent.com/mackron/miniaudio/master/miniaudio.h
 cp dl/miniaudio.h cjit-demo/include
-fetch termbox2.h https://raw.githubusercontent.com/termbox/termbox2/refs/heads/master/termbox2.h
+[ -r ${odir}/termbox2.h ] ||
+	curl -L --output ${odir}/termbox2.h https://raw.githubusercontent.com/termbox/termbox2/refs/heads/master/termbox2.h
 cp dl/termbox2.h cjit-demo/include
 
 mkdir -p cjit-demo/include/SDL2
 
 # SDL2
+org=libsdl-org
+proj=SDL
 ver=2.30.10
 file=SDL2-${ver}-win32-x64.zip
 url="https://github.com/libsdl-org/SDL/releases/download/release-${ver}"
-fetch ${file} ${url}/${file}
-[ -r cjit-demo/SDL2.dll ] || unzip -q -d cjit-demo ${file} SDL2.dll
+fetch ${file} ${url}/${file} ${org} ${proj} release-${ver}
+[ -r cjit-demo/SDL2.dll ] || unzip -q -d cjit-demo ${odir}/${file} SDL2.dll
 file=SDL2-${ver}
-fetch ${file}.zip ${url}/${file}.zip
+fetch ${file}.zip ${url}/${file}.zip ${org} ${proj} release-${ver}
 [ -r cjit-demo/include/SDL2/SDL.h ] || {
-	unzip -q -d /tmp ${file}.zip SDL2-${ver}/include/*
+	unzip -q -d /tmp ${odir}/${file}.zip SDL2-${ver}/include/*
 	mv /tmp/${file}/include/* cjit-demo/include/SDL2/
 	rm -rf /tmp/${file}
 }
 
 # SDL2_image
+proj=SDL_image
 ver=2.8.3
 file=SDL2_image-${ver}-win32-x64.zip
 url="https://github.com/libsdl-org/SDL_image/releases/download/release-${ver}"
-fetch ${file} ${url}/${file}
+fetch ${file} ${url}/${file} ${org} ${proj} release-${ver}
 [ -r cjit-demo/SDL2_image.dll ] ||
-	unzip -q -d cjit-demo ${file} SDL2_image.dll
+	unzip -q -d cjit-demo ${odir}/${file} SDL2_image.dll
 file=SDL2_image-${ver}
-fetch ${file}.zip ${url}/${file}.zip
+fetch ${file}.zip ${url}/${file}.zip ${org} ${proj} release-${ver}
 [ -r cjit-demo/include/SDL2/SDL_image.h ] || {
-	unzip -q -d /tmp ${file}.zip ${file}/include/SDL_image.h
+	unzip -q -d /tmp ${odir}/${file}.zip ${file}/include/SDL_image.h
 	mv /tmp/${file}/include/SDL_image.h cjit-demo/include/SDL2/
 	rm -rf /tmp/${file}
 }
 
 # SDL2_ttf
+proj=SDL_ttf
 ver=2.22.0
 url="https://github.com/libsdl-org/SDL_ttf/releases/download/release-${ver}"
 file=SDL2_ttf-${ver}-win32-x64.zip
-fetch ${file} ${url}/${file}
+fetch ${file} ${url}/${file} ${org} ${proj} release-${ver}
 [ -r cjit-demo/SDL2_ttf.dll ] ||
-	unzip -q -d cjit-demo ${file} SDL2_ttf.dll
+	unzip -q -d cjit-demo ${odir}/${file} SDL2_ttf.dll
 file=SDL2_ttf-${ver}
 fetch ${file}.zip ${url}/${file}.zip
 [ -r cjit-demo/include/SDL2/SDL_ttf.h ] || {
-	unzip -q -d /tmp ${file} ${file}/SDL_ttf.h
+	unzip -q -d /tmp ${odir}/${file} ${file}/SDL_ttf.h
 	mv /tmp/${file}/SDL_ttf.h cjit-demo/include/SDL2/
 	rm -rf /tmp/${file}
 }
 
+org=nigels-com
+proj=glew
 ver=2.2.0
 url="https://github.com/nigels-com/glew/releases/download/glew-${ver}"
 file="glew-${ver}-win32.zip"
-fetch ${file} ${url}/${file}
+fetch ${file} ${url}/${file} ${org} ${proj} glew-${ver}
 [ -r cjit-demo/glew32.dll ] || {
-	unzip -q -d /tmp ${file}
+	unzip -q -d /tmp ${odir}/${file}
 	mv /tmp/glew-${ver}/bin/Release/x64/glew32.dll cjit-demo/
 	mv /tmp/glew-${ver}/include/GL cjit-demo/include/
 	rm -rf /tmp/glew-${ver}