From c4788fec12de3528bde132dc68769a7d17a5f4b9 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 15 Oct 2016 12:47:26 -0600 Subject: [PATCH] Add private key --- .travis.yml | 7 +++++-- scripts/create_release.py | 21 +++++++++++++++++++-- scripts/ssh_private_key.enc | Bin 0 -> 1680 bytes 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 scripts/ssh_private_key.enc diff --git a/.travis.yml b/.travis.yml index 93848b0d..9c6ef701 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,11 @@ language: csharp -solution: ./TShockAPI/TShockAPI.csproj +solution: "./TShockAPI/TShockAPI.csproj" install: - - nuget restore +- nuget restore script: python ./scripts/create_release.py notifications: slack: secure: O4Nibe2fdaUa2ZxuETUg6WEoQKvNM2CotnfaIVgm3fjfe61dfE1P+EgTpbwDG8646jSmpTqMDw8Z6I/WJwGTlXV/ZQsbwu63Cps4MgOTvPHZ0Lsye5azySlJZs1iI4ItYSj2czXfcnJ+qAl1SOOkXJrjB5uyTMWtDpCrSCFB3MA= +before_install: +- openssl aes-256-cbc -K $encrypted_1d7cd15ffdb4_key -iv $encrypted_1d7cd15ffdb4_iv + -in ssh_private_key.enc -out ssh_private_key -d diff --git a/scripts/create_release.py b/scripts/create_release.py index de53f2db..e7dbe9f2 100644 --- a/scripts/create_release.py +++ b/scripts/create_release.py @@ -92,14 +92,30 @@ def package_debug(): def delete_files(): os.chdir(release_dir) os.remove(mysql_bin_name) - os.remove(sqlite_bin_name) - os.remove(sqlite_dep) + # os.remove(sqlite_bin_name) + # os.remove(sqlite_dep) os.remove(json_bin_name) os.remove(bcrypt_bin_name) os.remove(http_bin_name) os.remove(geoip_db_name) os.chdir(cur_wd) +def upload_artifacts(): + if os.environ.get('TRAVIS_PULL_REQUEST', 'false') == 'false': + os.chdir(cur_wd) + os.mkdir(os.environ.get('TRAVIS_BRANCH', 'test-branch')) + os.chdir(os.environ.get('TRAVIS_BRANCH', 'test-branch')) + os.mkdir(os.environ.get('TRAVIS_BUILD_NUMBER', 'test-0407')) + os.chdir(cur_wd) + shutil.copy(os.path.join(release_dir, 'tshock_release.zip'), os.path.join(os.environ.get('TRAVIS_BRANCH', 'test-branch'), os.environ.get('TRAVIS_BUILD_NUMBER', 'test-0407'))) + shutil.copy(os.path.join(release_dir, 'tshock_debug.zip'), os.path.join(os.environ.get('TRAVIS_BRANCH', 'test-branch'), os.environ.get('TRAVIS_BUILD_NUMBER', 'test-0407'))) + target = open('./id_rsa', 'w') + target.write(os.environ.get('SECRET_SSH_KEY', 'nokey')) + target.close() + os.chmod('./id_rsa', 0600) + upload_process = subprocess.Popen(['scp', '-i', './id_rsa', '-r', os.environ.get('TRAVIS_BRANCH', 'test-branch'), 'tshock-travis@arc.shanked.me:/usr/share/nginx/tshock-travis/']) + upload_process.wait() + def update_terraria_source(): subprocess.check_call(['/usr/bin/git', 'submodule', 'init']) subprocess.check_call(['/usr/bin/git', 'submodule', 'update']) @@ -122,3 +138,4 @@ if __name__ == '__main__': package_release() package_debug() delete_files() + upload_artifacts() diff --git a/scripts/ssh_private_key.enc b/scripts/ssh_private_key.enc new file mode 100644 index 0000000000000000000000000000000000000000..76fbbec9a26705f4c0afa7b8028856ced4ed0488 GIT binary patch literal 1680 zcmV;B25kz*bK!PGcRPRc7ItCk&BHpcx;_f|=R+h+7{+!H(s z;lPi6t1Ag)gpI(4;?#=_PWlDJY=aAyAO7q}k4`198CAAi8~fQ%gc}OKsaeJS{)p4U zif2j1t%?cRH#L6EQ_dr4c59J|MHSrA^h(9{3Yo=|h@9~Slx5F0P>b_HpONu#^R5Ap zhrn|)5f{{Ykd!E1VEZYHImcX5hh%m;&d#$wwrex(dN|p_a(~cdRNQ_V{Z+k2g&#akuhOq2Ba^HV)T)79(aG!$U10zn%);T+5vS zCo&}4f$TM@@8>4${&4bq)~ObLCgGE|+%DD5+q{C!GutNk9k~E1YJn zoN?J6Q2*!W@Xr`4jzOrl2mD$b zSZ_T1MYp;G9#YXDztzg&)C2I1BwQdB^y^8>juSzF4JWs0+Zo)Eka*iGP~Ftt;d<4-8JGL~zj~+y4cgMhzJaE)6> z<@9k_H_zoETGy+`RvsG(kNjqnz`I={o))Kb^9Rah*PWoZkPtfw_%~zV&cV?ElPa%t*uSoWwb|o5g{NZR#2*)^%p1qAIdr#~bUC%AfPhHc7F-Yp-p zJaR_L0StvqKUO{3&p1h}U7%_sPq`t(lUYtKm;ZNnqYx=aos@?7q7dsKXfCQZDygP- z*{b8hcJ49_h+)(ow$!C;x6SlD9P57Fq1f5u2y|r})WO+zub{&WU*WlJ`qw-};`KBP zo~HD^W%=HKFP@gU6(D4@M9dTTQz|*$uqN2i5Mo04OaubDMuBA4U&JShGLnBY2KRiY zktKG9XV&WR#_5@6K90(-CGLE#dcf)xtOKG!EH@Rcdn#G&&0O;v zJK81kc~Qgp$?VOO5MK@2Q5+qarHF-Y8u%J20zV{`=2zc&fDn7RSxiQ`-qiaU1~&3y)p#~)AQ&Fn%ymXdd8JHeeqey zo`*7}7=DJ=4phWDZEgF1McdJ6tWhkN#+6#E1>^BF6pqPQ)e-}nixx1r+I7s$?oF{1 zt&bVrHb^q<1K_J!^$a1*)1M;p-56B0<;S-TLE&_kMYPS&XIwsBOMTFc5sr-YGesZZp$M z54sn*jm0{mmL*WPWX+b3MuYNv844(gqTShF&eTK<{9AnCE;~kBMQ{!)#GUqI!_SkF zv0&h*mfSYEwO^Mks1X)o`uktp$NPRJVvQq5o+Y_O$BIMLJP8KH4ROaLu8;S-Om6n| zqsz3wgUu5;ZEMw&r8zVqDs+A>{U=pzt8+m})F46CC#`G@YEf9_18>@Iq%fu5+(S%@ zP9F`=ZL&FST0CCNg4#0Pu>WcC;19q