deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 20:31:35 +00:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

further linux cleanup, re-enable e2e

Browse Source
This commit is contained in:
Jay Lee
2019-10-13 14:06:29 -04:00
parent d0262ea6ae
commit 6a5fb33306
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -58,6 +58,7 @@ matrix:
name: "Linux ARM64 Bionic" name: "Linux ARM64 Bionic"
language: bash language: bash
filter_secrets: false filter_secrets: false
allow_failures: true
env: env:
- GAMOS=linux - GAMOS=linux
- PLATFORM=arm64 - PLATFORM=arm64
@@ -175,7 +176,7 @@ script:
- if [ "$VMTYPE" == "build" ]; then $gam version extended | grep TLSv1\.[23]; fi # Builds should default TLS 1.2 or 1.3 to Google - if [ "$VMTYPE" == "build" ]; then $gam version extended | grep TLSv1\.[23]; fi # Builds should default TLS 1.2 or 1.3 to Google
- if [ "$VMTYPE" == "build" ]; then GAM_TLS_MIN_VERSION=TLSv1_2 $gam version extended location tls-v1-0.badssl.com:1010; [[ $? == 3 ]]; fi # expect fail since server doesn't support our TLS version - if [ "$VMTYPE" == "build" ]; then GAM_TLS_MIN_VERSION=TLSv1_2 $gam version extended location tls-v1-0.badssl.com:1010; [[ $? == 3 ]]; fi # expect fail since server doesn't support our TLS version
- export jid="$(cut -d'.' -f2 <<<"$TRAVIS_JOB_NUMBER")" - export jid="$(cut -d'.' -f2 <<<"$TRAVIS_JOB_NUMBER")"
#- if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then export e2e=true; fi - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then export e2e=true; fi
- if [ "$e2e" = true ]; then export gam_user=gam-travis-$jid@pdl.jaylee.us; fi - if [ "$e2e" = true ]; then export gam_user=gam-travis-$jid@pdl.jaylee.us; fi
- if [ "$e2e" = true ]; then openssl aes-256-cbc -K $encrypted_ab10ec38326e_key -iv $encrypted_ab10ec38326e_iv -in travis/oauth2service.json.enc -out $gampath/oauth2service.json -d; fi - if [ "$e2e" = true ]; then openssl aes-256-cbc -K $encrypted_ab10ec38326e_key -iv $encrypted_ab10ec38326e_iv -in travis/oauth2service.json.enc -out $gampath/oauth2service.json -d; fi
- if [ "$e2e" = true ]; then cat travis/cfg_template.json | python travis/svars-write.py &> /dev/null; fi - if [ "$e2e" = true ]; then cat travis/cfg_template.json | python travis/svars-write.py &> /dev/null; fi

11
src/travis/linux-x86_64-before-install.sh
View File

@@ -71,12 +71,8 @@ else
make install > /dev/null make install > /dev/null
cd ~ cd ~
fi fi
python=~/python/bin/python3
pip=~/python/bin/pip3
cd $whereibelong
fi
if [[ "$dist" == "precise" ]]; then if [[ "$dist" == "precise" ]]; then
echo "Installing deps for StaticX..." echo "Installing deps for StaticX..."
sudo apt-get install --yes scons sudo apt-get install --yes scons
if [ ! -d patchelf-$PATCHELF_VERSION ]; then if [ ! -d patchelf-$PATCHELF_VERSION ]; then
@@ -89,6 +85,11 @@ if [[ "$dist" == "precise" ]]; then
sudo make install sudo make install
fi fi
$pip install git+https://github.com/JonathonReinhart/staticx.git@master $pip install git+https://github.com/JonathonReinhart/staticx.git@master
fi
python=~/python/bin/python3
pip=~/python/bin/pip3
cd $whereibelong
fi fi
echo "Upgrading pip packages..." echo "Upgrading pip packages..."