From 0d90bedf8787c00c2db621edbc56f5574ae4449b Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Thu, 13 Jul 2023 20:31:20 +0200 Subject: [PATCH 1/3] Provide experimental builds with static runtime --- .github/workflows/main.yml | 5 +++++ ci/build.sh | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 329fedd0..1bd140c2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,6 +14,10 @@ jobs: matrix: ARCH: [x86_64, i386] BUILD_TYPE: [appimage, coverage] + include: + - ARCH: x86_64 + BUILD_TYPE: appimage + USE_STATIC_RUNTIME: 1 fail-fast: false name: ${{ matrix.BUILD_TYPE }} ${{ matrix.ARCH }} @@ -22,6 +26,7 @@ jobs: env: ARCH: ${{ matrix.ARCH }} BUILD_TYPE: ${{ matrix.BUILD_TYPE }} + USE_STATIC_RUNTIME: ${{ matrix.USE_STATIC_RUNTIME }} steps: - uses: actions/checkout@v2 diff --git a/ci/build.sh b/ci/build.sh index fdd1dc3a..201f4c51 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -79,6 +79,14 @@ ln -s ../../plugins/linuxdeploy-plugin-appimage/AppRun AppDir/usr/bin/linuxdeplo export UPD_INFO="gh-releases-zsync|linuxdeploy|linuxdeploy|continuous|linuxdeploy-$ARCH.AppImage.zsync" export OUTPUT="linuxdeploy-$ARCH.AppImage" +# special set of builds using a different experimental runtime, used for testing purposes +if [[ "$USE_STATIC_RUNTIME" != "" ]]; then + export OUTPUT="linuxdeploy-static-$ARCH.AppImage" + wget https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-"$ARCH" + runtime_filename="$(echo "$CUSTOM_RUNTIME_URL" | rev | cut -d/ -f1 | rev)" + export LDAI_RUNTIME_FILE"$(readlink -f "$runtime_filename")" +fi + # build AppImage using plugin AppDir/usr/bin/linuxdeploy-plugin-appimage --appdir AppDir/ From 559b750b22cb02eb7668607b0564cd2f14140cc3 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Thu, 13 Jul 2023 20:58:14 +0200 Subject: [PATCH 2/3] fixup! Provide experimental builds with static runtime --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1bd140c2..2241ab5e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,12 +15,12 @@ jobs: ARCH: [x86_64, i386] BUILD_TYPE: [appimage, coverage] include: - - ARCH: x86_64 - BUILD_TYPE: appimage - USE_STATIC_RUNTIME: 1 + - ARCH: x86_64 + BUILD_TYPE: appimage + USE_STATIC_RUNTIME: 1 fail-fast: false - name: ${{ matrix.BUILD_TYPE }} ${{ matrix.ARCH }} + name: ${{ matrix.BUILD_TYPE }} ${{ matrix.ARCH }} USE_STATIC_RUNTIME=${{ matrix.USE_STATIC_RUNTIME }} runs-on: ubuntu-20.04 env: @@ -77,4 +77,4 @@ jobs: run: | wget -q https://github.com/TheAssassin/pyuploadtool/releases/download/continuous/pyuploadtool-x86_64.AppImage chmod +x pyuploadtool-x86_64.AppImage - ./pyuploadtool-x86_64.AppImage **/linuxdeploy*.AppImage* + ./pyuploadtool-x86_64.AppImage ./**/linuxdeploy*.AppImage* From 524d81225709205eab848f9ead004138d0099cfa Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Thu, 13 Jul 2023 21:10:30 +0200 Subject: [PATCH 3/3] fixup! fixup! Provide experimental builds with static runtime --- .github/workflows/main.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2241ab5e..ce4846c8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,13 +14,14 @@ jobs: matrix: ARCH: [x86_64, i386] BUILD_TYPE: [appimage, coverage] + USE_STATIC_RUNTIME: [""] include: - - ARCH: x86_64 - BUILD_TYPE: appimage - USE_STATIC_RUNTIME: 1 + - ARCH: x86_64 + BUILD_TYPE: appimage + USE_STATIC_RUNTIME: 1 fail-fast: false - name: ${{ matrix.BUILD_TYPE }} ${{ matrix.ARCH }} USE_STATIC_RUNTIME=${{ matrix.USE_STATIC_RUNTIME }} + name: ${{ matrix.BUILD_TYPE }} ${{ matrix.ARCH }} static=${{ matrix.USE_STATIC_RUNTIME }} runs-on: ubuntu-20.04 env: