From 99d48b193939e4fbabba7c4ceb56b403d8cef488 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 5 Oct 2021 16:49:36 -0400 Subject: [PATCH 1/3] Update linux-before-install.sh --- .github/actions/linux-before-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/linux-before-install.sh b/.github/actions/linux-before-install.sh index b301f12c61..396059add3 100755 --- a/.github/actions/linux-before-install.sh +++ b/.github/actions/linux-before-install.sh @@ -94,7 +94,7 @@ else python=~/python/bin/python3 pip=~/python/bin/pip3 - if ([ "${ImageOS}" == "ubuntu18" ]) && [ "${HOSTTYPE}" == "x86_64" ]; then + if ([ "${ImageOS}" == "ubuntu20" ]) && [ "${HOSTTYPE}" == "x86_64" ]; then echo "Installing deps for StaticX..." if [ ! -d patchelf-$PATCHELF_VERSION ]; then echo "Downloading PatchELF $PATCHELF_VERSION" From 58190343b159ef999a70a1234df521630d1f1b2d Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 5 Oct 2021 16:49:53 -0400 Subject: [PATCH 2/3] Update linux-install.sh --- .github/actions/linux-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/linux-install.sh b/.github/actions/linux-install.sh index 5772d71fea..921f8dd137 100755 --- a/.github/actions/linux-install.sh +++ b/.github/actions/linux-install.sh @@ -17,7 +17,7 @@ tar -C ${distpath} --create --file $GAM_ARCHIVE --xz gam echo "PyInstaller GAM info:" du -h $gam time $gam version extended -if ([ "${ImageOS}" == "ubuntu18" ]) && [ "${HOSTTYPE}" == "x86_64" ]; then +if ([ "${ImageOS}" == "ubuntu20" ]) && [ "${HOSTTYPE}" == "x86_64" ]; then GAM_LEGACY_ARCHIVE=gam-${GAMVERSION}-${GAMOS}-${PLATFORM}-legacy.tar.xz $python -OO -m staticx $gam $gam-staticx #strip $gam-staticx From b1805b64a28a080463eb63ecfb02005d147dbf4a Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 5 Oct 2021 17:58:20 -0400 Subject: [PATCH 3/3] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4dff38551c..e8f2313427 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,7 +73,7 @@ jobs: platform: "x86_64" - os: ubuntu-20.04 goal: test - python: "3.10.0-beta.1" + python: "3.10.0" jid: 9 gamos: linux platform: x86_64