Merge branch 'main' of https://github.com/jay0lee/GAM into main

GAM-team · Oct 5, 2021 · 93bf3fc · 93bf3fc
2 parents 8996015 + b1805b6
commit 93bf3fc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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"

diff --git 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

diff --git 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