From a0cff87e5fff08af2fcc5c7d8742b59ca1e36a7e Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 4 Dec 2020 12:02:06 -0500 Subject: [PATCH] actions take 67 --- .github/workflows/build.yml | 7 +++++++ src/travis/linux-before-install.sh | 4 ---- src/travis/macos-before-install.sh | 4 ---- src/travis/windows-before-install.sh | 4 ---- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4cf8e8dc..c694db66 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -121,6 +121,13 @@ jobs: echo "pip=$pip" >> $GITHUB_ENV echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV + - name: Install pip requirements + run: | + cd src + $pip install --upgrade pip + $pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $pip install -U + $pip install --upgrade -r requirements.txt + - name: Build GAM with PyInstaller if: matrix.goal != 'test' run: | diff --git a/src/travis/linux-before-install.sh b/src/travis/linux-before-install.sh index 40655f75..3b923f01 100755 --- a/src/travis/linux-before-install.sh +++ b/src/travis/linux-before-install.sh @@ -112,7 +112,3 @@ else cd $whereibelong fi - -echo "Upgrading pip packages..." -$pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $pip install -U -$pip install --upgrade -r requirements.txt diff --git a/src/travis/macos-before-install.sh b/src/travis/macos-before-install.sh index 2d40dbfc..01558e4a 100755 --- a/src/travis/macos-before-install.sh +++ b/src/travis/macos-before-install.sh @@ -103,9 +103,5 @@ $python -V cd $whereibelong -#export PATH=/usr/local/opt/python/libexec/bin:$PATH -$pip install --upgrade pip -$pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $pip install -U -$pip install --upgrade -r requirements.txt $pip install --upgrade git+git://github.com/pyinstaller/pyinstaller.git@$PYINSTALLER_COMMIT diff --git a/src/travis/windows-before-install.sh b/src/travis/windows-before-install.sh index e7106626..cc06bad1 100755 --- a/src/travis/windows-before-install.sh +++ b/src/travis/windows-before-install.sh @@ -44,10 +44,6 @@ fi cd $mypath -$pip install --upgrade pip -$pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $pip install -U -$pip install --upgrade -r requirements.txt -#$pip install --upgrade pyinstaller # Install PyInstaller from source and build bootloader # to try and avoid getting flagged as malware since # lots of malware uses PyInstaller default bootloader