diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index be013f5..1ecfb65 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -226,7 +226,8 @@ jobs: - name: pack the cjit-demo archive run: | bash build/pack-examples.sh - mv cjit-demo.tar.gz cjit-bin/release-tutorial/ + mkdir -p cjit-bin/release-demo/ + mv cjit-demo.tar.gz cjit-bin/release-demo/ - name: show release directory structure run: tree -dL 3 - name: relase all binary artifacts @@ -276,7 +277,7 @@ jobs: remove-tag-on-fail: name: 🧻 Remove tag on fail - needs: [semantic-release, osx-native-release, musl-release, linux-release, win-native-release] + needs: [binary-release, semantic-release, osx-native-release, musl-release, linux-release, win-native-release] runs-on: ubuntu-latest if: ${{ (failure() || cancelled()) && needs.semantic-release.outputs.new_release_published == 'true' }} steps: @@ -287,5 +288,5 @@ jobs: with: tag_name: v${{ needs.semantic-release.outputs.new_release_version }} github_token: ${{ secrets.GITHUB_TOKEN }} - delete_release: false + delete_release: true repo: dyne/cjit diff --git a/build/pack-examples.sh b/build/pack-examples.sh index ad726b6..ebe9e37 100644 --- a/build/pack-examples.sh +++ b/build/pack-examples.sh @@ -13,13 +13,13 @@ mkdir -p cjit-demo/SDL2 # SDL2 ver=2.30.10 -url="https://github.com/libsdl-org/SDL2/releases/download/release-${ver}" +url="https://github.com/libsdl-org/SDL/releases/download/release-${ver}" [ -r SDL2-${ver}-win32-x64.zip ] || - wget ${url}/SDL2-${ver}-win32-x64.zip + wget -q ${url}/SDL2-${ver}-win32-x64.zip [ -r cjit-demo/SDL2.dll ] || unzip -q -d cjit-demo SDL2-${ver}-win32-x64.zip SDL2.dll [ -r SDL2-${ver}.zip ] || - wget ${url}/SDL2-${ver}.zip + wget -q ${url}/SDL2-${ver}.zip [ -r cjit-demo/SDL2/SDL.h ] || { unzip -q -d /tmp SDL2-${ver}.zip SDL2-${ver}/include/* mv /tmp/SDL2-${ver}/include cjit-demo/SDL2 @@ -30,11 +30,11 @@ url="https://github.com/libsdl-org/SDL2/releases/download/release-${ver}" ver=2.8.3 url="https://github.com/libsdl-org/SDL_image/releases/download/release-${ver}" [ -r SDL2_image-${ver}-win32-x64.zip ] || - wget ${url}/SDL2_image-${ver}-win32-x64.zip + wget -q ${url}/SDL2_image-${ver}-win32-x64.zip [ -r cjit-demo/SDL2_image.dll ] || unzip -q -d cjit-demo SDL2_image-${ver}-win32-x64.zip SDL2_image.dll [ -r SDL2_image-${ver}.zip ] || - wget ${url}/SDL2_image-${ver}.zip + wget -q ${url}/SDL2_image-${ver}.zip [ -r cjit-demo/SDL2/SDL_image.h ] || { unzip -q -d /tmp SDL2_image-${ver}.zip SDL2_image-${ver}/include/SDL_image.h mv /tmp/SDL2_image-${ver}/include/SDL_image.h cjit-demo/SDL2/ @@ -45,26 +45,27 @@ url="https://github.com/libsdl-org/SDL_image/releases/download/release-${ver}" ver=2.22.0 url="https://github.com/libsdl-org/SDL_ttf/releases/download/release-${ver}" [ -r SDL2_ttf-${ver}-win32-x64.zip ] || - wget ${url}/SDL2_ttf-${ver}-win32-x64.zip + wget -q ${url}/SDL2_ttf-${ver}-win32-x64.zip [ -r cjit-demo/SDL2_ttf.dll ] || unzip -q -d cjit-demo SDL2_ttf-${ver}-win32-x64.zip SDL2_ttf.dll [ -r SDL2_ttf-${ver}.zip ] || - wget ${url}/SDL2_ttf-${ver}.zip + wget -q ${url}/SDL2_ttf-${ver}.zip [ -r cjit-demo/SDL2/SDL_ttf.h ] || { unzip -q -d /tmp SDL2_ttf-${ver}.zip SDL2_ttf-${ver}/SDL_ttf.h mv /tmp/SDL2_ttf-${ver}/SDL_ttf.h cjit-demo/SDL2/ rm -rf /tmp/SDL2_ttf-${ver} } - -[ -r ${glew} ] || { - wget "https://github.com/nigels-com/glew/releases/download/glew-2.2.0/glew-2.2.0-win32.zip" +ver=2.2.0 +url="https://github.com/nigels-com/glew/releases/download/glew-${ver}/glew-${ver}-win32.zip" +[ -r glew-${ver}-win32.zip ] || { + wget -q ${url} } [ -r cjit-demo/glew32.dll ] || { - unzip -q -d /tmp glew-2.2.0-win32.zip - mv /tmp/glew-2.2.0/bin/Release/x64/glew32.dll cjit-demo/ - mv /tmp/glew-2.2.0/include/GL cjit-demo/ - rm -rf /tmp/glew-2.2.0 + unzip -q -d /tmp glew-${ver}-win32.zip + mv /tmp/glew-${ver}/bin/Release/x64/glew32.dll cjit-demo/ + mv /tmp/glew-${ver}/include/GL cjit-demo/ + rm -rf /tmp/glew-${ver} } tar --format ustar -czf cjit-demo.tar.gz cjit-demo