diff --git a/.travis/appveyor-deploy.ps1 b/.travis/appveyor-deploy.ps1 index 6116c0845..5f3fa01a3 100644 --- a/.travis/appveyor-deploy.ps1 +++ b/.travis/appveyor-deploy.ps1 @@ -1,7 +1,7 @@ mv setup_win.bat internal\ -$filename = "appveyor" + (get-date -uformat "%Y-%m-%d-%H-%M-%S") + "_" + $Env:APPVEYOR_REPO_COMMIT.Substring(0,7) + "-" + $Env:APPVEYOR_REPO_BRANCH + "_win.7z" +$filename = "qb64_" + (get-date -uformat "%Y-%m-%d-%H-%M-%S") + "_" + $Env:APPVEYOR_REPO_COMMIT.Substring(0,7) + "-" + $Env:APPVEYOR_REPO_BRANCH + "_win.7z" cd .. qb64\internal\c\c_compiler\7z\7za.exe a '-xr@qb64\.travis\common-exclusion.list' '-xr@qb64\.travis\win-exclusion.list' $filename qb64 -scp -o StrictHostKeyChecking=no $filename m6rosupy1q2t@qb64.org:autobuilds/$Env:APPVEYOR_REPO_BRANCH/ +scp -q -o StrictHostKeyChecking=no $filename m6rosupy1q2t@qb64.org:autobuilds/$Env:APPVEYOR_REPO_BRANCH/ diff --git a/.travis/appveyor.bat b/.travis/appveyor.bat index 09d5f0d0d..13b6b3688 100644 --- a/.travis/appveyor.bat +++ b/.travis/appveyor.bat @@ -41,6 +41,7 @@ c_compiler\bin\g++ -mconsole -s -Wfatal-errors -w -Wall qbx.cpp libqb\os\win\lib IF ERRORLEVEL 1 exit /b 1 cd ..\.. +echo Compiling new QB64 echo AutoBuildMsg$ = CHR$(10) + "From git %APPVEYOR_REPO_COMMIT:~0,7%" + CHR$(10) >> source\global\version.bas qb64_bootstrap.exe -x source\qb64.bas -o qb64.exe IF ERRORLEVEL 1 exit /b 1 diff --git a/.travis/common-exclusion.list b/.travis/common-exclusion.list index 05e122e4a..e2f302743 100644 --- a/.travis/common-exclusion.list +++ b/.travis/common-exclusion.list @@ -1,5 +1,6 @@ .travis .travis.yml +appveyor.yml .git .gitignore diff --git a/.travis/win-exclusion.list b/.travis/win-exclusion.list index 4813acada..4097a0ca6 100644 --- a/.travis/win-exclusion.list +++ b/.travis/win-exclusion.list @@ -1,6 +1,7 @@ setup_lnx.sh setup_osx.command qb64_start_osx.command +secure-file qb64\internal\c\c_compiler\bin qb64\internal\c\c_compiler\i686-w64-mingw32 qb64\internal\c\c_compiler\include diff --git a/appveyor.yml b/appveyor.yml index b5532e778..9a48a055a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,6 +11,4 @@ install: - cmd: secure-file\tools\secure-file -decrypt .travis\qb64.org_rsa.enc -secret %sshkey% -out %userprofile%\.ssh\id_rsa deploy_script: - ps: .travis\appveyor-deploy.ps1 -test: off -on_finish: - - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) +test: off \ No newline at end of file