From c49292416fb339d14c5a8e86c0b2579687064c76 Mon Sep 17 00:00:00 2001 From: Fabian Terhorst Date: Thu, 27 Jun 2019 19:14:39 +0200 Subject: [PATCH 1/5] Update .travis.yml --- .travis.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5770a87962..37982123b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,10 @@ sudo: false language: cpp env: - GITHUB_DEPLOY_PRERELEASE=$(if echo $VERSION | grep -q "\-" ; then echo true; else echo false; fi) + - WINDOWS_BETA = $(if "$GITHUB_DEPLOY_PRERELEASE" = true && "$TRAVIS_OS_NAME" = "windows" ; then echo true; else echo false; fi) + - LINUX_BETA = $(if "$GITHUB_DEPLOY_PRERELEASE" = true && "$TRAVIS_OS_NAME" = "linux" ; then echo true; else echo false; fi) + - WINDOWS_STABLE = $(if "$GITHUB_DEPLOY_PRERELEASE" = false && "$TRAVIS_OS_NAME" = "windows" ; then echo true; else echo false; fi) + - LINUX_STABLE = $(if "$GITHUB_DEPLOY_PRERELEASE" = false && "$TRAVIS_OS_NAME" = "linux" ; then echo true; else echo false; fi) #branches: # only: # - master @@ -43,7 +47,7 @@ deploy: file: libcsharp-module.so on: repo: FabianTerhorst/coreclr-module - condition: os = linux AND env(GITHUB_DEPLOY_PRERELEASE) IS false + condition: "$LINUX_STABLE" = true tags: true - provider: releases skip_cleanup: true @@ -52,7 +56,7 @@ deploy: file: csharp-module.dll on: repo: FabianTerhorst/coreclr-module - condition: os = windows AND env(GITHUB_DEPLOY_PRERELEASE) IS false + condition: "$WINDOWS_STABLE" = true tags: true - provider: releases skip_cleanup: true @@ -62,7 +66,7 @@ deploy: file: libcsharp-module.so on: repo: FabianTerhorst/coreclr-module - condition: os = linux AND env(GITHUB_DEPLOY_PRERELEASE) IS true + condition: "$LINUX_BETA" = true tags: true - provider: releases skip_cleanup: true @@ -72,21 +76,21 @@ deploy: file: csharp-module.dll on: repo: FabianTerhorst/coreclr-module - condition: os = windows AND env(GITHUB_DEPLOY_PRERELEASE) IS true + condition: "$WINDOWS_BETA" = true tags: true - provider: script skip_cleanup: true script: cd .. && cd .. && cd .. && cd .. && scs3-win.exe upload .\runtime\build\src\Release\csharp-module.dll coreclr-module/stable/x64_win32/csharp-module.dll on: repo: FabianTerhorst/coreclr-module - condition: os = windows AND env(GITHUB_DEPLOY_PRERELEASE) IS false + condition: "$WINDOWS_STABLE" = true tags: true - provider: script skip_cleanup: true script: cd .. && cd .. && cd .. && chmod +x ./scs3-linux && ./scs3-linux upload ./runtime/build/src/libcsharp-module.so coreclr-module/stable/x64_linux/libcsharp-module.so on: repo: FabianTerhorst/coreclr-module - condition: os = linux AND env(GITHUB_DEPLOY_PRERELEASE) IS false + condition: "$LINUX_STABLE" = true tags: true - provider: script skip_cleanup: true @@ -94,7 +98,7 @@ deploy: script: cd .. && cd .. && cd .. && cd .. && scs3-win.exe upload .\runtime\build\src\Release\csharp-module.dll coreclr-module/beta/x64_win32/csharp-module.dll on: repo: FabianTerhorst/coreclr-module - condition: os = windows AND env(GITHUB_DEPLOY_PRERELEASE) IS true + condition: "$WINDOWS_BETA" = true tags: true - provider: script skip_cleanup: true @@ -102,5 +106,5 @@ deploy: script: cd .. && cd .. && cd .. && chmod +x ./scs3-linux && ./scs3-linux upload ./runtime/build/src/libcsharp-module.so coreclr-module/beta/x64_linux/libcsharp-module.so on: repo: FabianTerhorst/coreclr-module - condition: os = linux AND env(GITHUB_DEPLOY_PRERELEASE) IS true + condition: "$LINUX_BETA" = true tags: true From fcc8e68751ac11c846b7625792f779f6a9b74aa8 Mon Sep 17 00:00:00 2001 From: Fabian Terhorst Date: Thu, 27 Jun 2019 19:18:51 +0200 Subject: [PATCH 2/5] Update .travis.yml --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37982123b4..b0a0b6296e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,10 @@ sudo: false language: cpp env: - GITHUB_DEPLOY_PRERELEASE=$(if echo $VERSION | grep -q "\-" ; then echo true; else echo false; fi) - - WINDOWS_BETA = $(if "$GITHUB_DEPLOY_PRERELEASE" = true && "$TRAVIS_OS_NAME" = "windows" ; then echo true; else echo false; fi) - - LINUX_BETA = $(if "$GITHUB_DEPLOY_PRERELEASE" = true && "$TRAVIS_OS_NAME" = "linux" ; then echo true; else echo false; fi) - - WINDOWS_STABLE = $(if "$GITHUB_DEPLOY_PRERELEASE" = false && "$TRAVIS_OS_NAME" = "windows" ; then echo true; else echo false; fi) - - LINUX_STABLE = $(if "$GITHUB_DEPLOY_PRERELEASE" = false && "$TRAVIS_OS_NAME" = "linux" ; then echo true; else echo false; fi) + - WINDOWS_BETA=$(if ["$GITHUB_DEPLOY_PRERELEASE" = true] && ["$TRAVIS_OS_NAME" = "windows"] ; then echo true; else echo false; fi) + - LINUX_BETA=$(if ["$GITHUB_DEPLOY_PRERELEASE" = true] && ["$TRAVIS_OS_NAME" = "linux"] ; then echo true; else echo false; fi) + - WINDOWS_STABLE=$(if ["$GITHUB_DEPLOY_PRERELEASE" = false] && ["$TRAVIS_OS_NAME" = "windows"] ; then echo true; else echo false; fi) + - LINUX_STABLE=$(if ["$GITHUB_DEPLOY_PRERELEASE" = false] && ["$TRAVIS_OS_NAME" = "linux"] ; then echo true; else echo false; fi) #branches: # only: # - master From b7ed1303a1ea2664a5fc224c759022f14f65a8d0 Mon Sep 17 00:00:00 2001 From: Fabian Terhorst Date: Thu, 27 Jun 2019 19:19:27 +0200 Subject: [PATCH 3/5] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b0a0b6296e..e89a820d54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,7 +83,7 @@ deploy: script: cd .. && cd .. && cd .. && cd .. && scs3-win.exe upload .\runtime\build\src\Release\csharp-module.dll coreclr-module/stable/x64_win32/csharp-module.dll on: repo: FabianTerhorst/coreclr-module - condition: "$WINDOWS_STABLE" = true + condition: "$WINDOWS_STABLE" = true tags: true - provider: script skip_cleanup: true From 13683eaf72837646adc084583f2c19bdfcfd32aa Mon Sep 17 00:00:00 2001 From: Fabian Terhorst Date: Thu, 27 Jun 2019 19:20:49 +0200 Subject: [PATCH 4/5] Update .travis.yml --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e89a820d54..d912c97925 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,10 @@ sudo: false language: cpp env: - GITHUB_DEPLOY_PRERELEASE=$(if echo $VERSION | grep -q "\-" ; then echo true; else echo false; fi) - - WINDOWS_BETA=$(if ["$GITHUB_DEPLOY_PRERELEASE" = true] && ["$TRAVIS_OS_NAME" = "windows"] ; then echo true; else echo false; fi) - - LINUX_BETA=$(if ["$GITHUB_DEPLOY_PRERELEASE" = true] && ["$TRAVIS_OS_NAME" = "linux"] ; then echo true; else echo false; fi) - - WINDOWS_STABLE=$(if ["$GITHUB_DEPLOY_PRERELEASE" = false] && ["$TRAVIS_OS_NAME" = "windows"] ; then echo true; else echo false; fi) - - LINUX_STABLE=$(if ["$GITHUB_DEPLOY_PRERELEASE" = false] && ["$TRAVIS_OS_NAME" = "linux"] ; then echo true; else echo false; fi) + - WINDOWS_BETA=$(if [ "$GITHUB_DEPLOY_PRERELEASE" = true ] && [ "$TRAVIS_OS_NAME" = "windows" ] ; then echo true; else echo false; fi) + - LINUX_BETA=$(if [ "$GITHUB_DEPLOY_PRERELEASE" = true ] && [ "$TRAVIS_OS_NAME" = "linux" ] ; then echo true; else echo false; fi) + - WINDOWS_STABLE=$(if [ "$GITHUB_DEPLOY_PRERELEASE" = false ] && [ "$TRAVIS_OS_NAME" = "windows" ] ; then echo true; else echo false; fi) + - LINUX_STABLE=$(if [ "$GITHUB_DEPLOY_PRERELEASE" = false ] && [ "$TRAVIS_OS_NAME" = "linux" ] ; then echo true; else echo false; fi) #branches: # only: # - master From f67f15c9d62b478ac271c8984d62a0ae3a1c79f9 Mon Sep 17 00:00:00 2001 From: Fabian Terhorst Date: Thu, 27 Jun 2019 19:22:48 +0200 Subject: [PATCH 5/5] Update .travis.yml --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index d912c97925..ae1e99fe33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ deploy: file: libcsharp-module.so on: repo: FabianTerhorst/coreclr-module - condition: "$LINUX_STABLE" = true + condition: "$LINUX_STABLE = true" tags: true - provider: releases skip_cleanup: true @@ -56,7 +56,7 @@ deploy: file: csharp-module.dll on: repo: FabianTerhorst/coreclr-module - condition: "$WINDOWS_STABLE" = true + condition: "$WINDOWS_STABLE = true" tags: true - provider: releases skip_cleanup: true @@ -66,7 +66,7 @@ deploy: file: libcsharp-module.so on: repo: FabianTerhorst/coreclr-module - condition: "$LINUX_BETA" = true + condition: "$LINUX_BETA = true" tags: true - provider: releases skip_cleanup: true @@ -76,21 +76,21 @@ deploy: file: csharp-module.dll on: repo: FabianTerhorst/coreclr-module - condition: "$WINDOWS_BETA" = true + condition: "$WINDOWS_BETA = true" tags: true - provider: script skip_cleanup: true script: cd .. && cd .. && cd .. && cd .. && scs3-win.exe upload .\runtime\build\src\Release\csharp-module.dll coreclr-module/stable/x64_win32/csharp-module.dll on: repo: FabianTerhorst/coreclr-module - condition: "$WINDOWS_STABLE" = true + condition: "$WINDOWS_STABLE = true" tags: true - provider: script skip_cleanup: true script: cd .. && cd .. && cd .. && chmod +x ./scs3-linux && ./scs3-linux upload ./runtime/build/src/libcsharp-module.so coreclr-module/stable/x64_linux/libcsharp-module.so on: repo: FabianTerhorst/coreclr-module - condition: "$LINUX_STABLE" = true + condition: "$LINUX_STABLE = true" tags: true - provider: script skip_cleanup: true @@ -98,7 +98,7 @@ deploy: script: cd .. && cd .. && cd .. && cd .. && scs3-win.exe upload .\runtime\build\src\Release\csharp-module.dll coreclr-module/beta/x64_win32/csharp-module.dll on: repo: FabianTerhorst/coreclr-module - condition: "$WINDOWS_BETA" = true + condition: "$WINDOWS_BETA = true" tags: true - provider: script skip_cleanup: true @@ -106,5 +106,5 @@ deploy: script: cd .. && cd .. && cd .. && chmod +x ./scs3-linux && ./scs3-linux upload ./runtime/build/src/libcsharp-module.so coreclr-module/beta/x64_linux/libcsharp-module.so on: repo: FabianTerhorst/coreclr-module - condition: "$LINUX_BETA" = true + condition: "$LINUX_BETA = true" tags: true