diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-07-06 10:25:44 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-07-06 10:25:44 -0700 |
| commit | 47594f7c996321f5a292f8422875984dea453f36 (patch) | |
| tree | e7ea895abe26c496b7f83122fe159608315e7d97 | |
| parent | 2f20258807f8665bc3f9c527106e61761e01ecc3 (diff) | |
| parent | 47122a3804fc5f704f4668657040a2eb643fa686 (diff) | |
| download | infinitytier-47594f7c996321f5a292f8422875984dea453f36.tar.gz infinitytier-47594f7c996321f5a292f8422875984dea453f36.zip | |
Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge
| -rw-r--r-- | Jenkinsfile | 14 | ||||
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj | 2 | ||||
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj.filters | 6 |
3 files changed, 8 insertions, 14 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 74c86249..d857614b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,9 +1,11 @@ #!/usr/bin/env groovy node('master') { + checkout scm + def changelog = getChangeLog currentBuild - slackSend "Building ${env.JOB_NAME} #${env.BUILD_NUMBER} \n Change Log: \n ${changelog}" + mattermostSend "Building ${env.JOB_NAME} #${env.BUILD_NUMBER} \n Change Log: \n ${changelog}" } parallel 'centos7': { @@ -17,7 +19,7 @@ parallel 'centos7': { } catch (err) { currentBuild.result = "FAILURE" - slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on Centos 7 (<${env.BUILD_URL}|Open>)" + mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on Centos 7 (<${env.BUILD_URL}|Open>)" throw err } @@ -33,7 +35,7 @@ parallel 'centos7': { } catch (err) { currentBuild.result = "FAILURE" - slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on Android NDK (<${env.BUILD_URL}|Open>)" + mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on Android NDK (<${env.BUILD_URL}|Open>)" throw err } @@ -53,7 +55,7 @@ parallel 'centos7': { } catch (err) { currentBuild.result = "FAILURE" - slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on macOS (<${env.BUILD_URL}|Open>)" + mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on macOS (<${env.BUILD_URL}|Open>)" throw err } @@ -72,11 +74,11 @@ msbuild windows\\ZeroTierOne.sln } catch (err) { currentBuild.result = "FAILURE" - slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on Windows (<${env.BUILD_URL}|Open>)" + mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on Windows (<${env.BUILD_URL}|Open>)" throw err } } } -slackSend color: "#00ff00", message: "${env.JOB_NAME} #${env.BUILD_NUMBER} Complete (<${env.BUILD_URL}|Show More...>)" +mattermostSend color: "#00ff00", message: "${env.JOB_NAME} #${env.BUILD_NUMBER} Complete (<${env.BUILD_URL}|Show More...>)" diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj index 9715f3d9..c966d64b 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj @@ -50,7 +50,6 @@ <ClCompile Include="..\..\node\Capability.cpp" /> <ClCompile Include="..\..\node\CertificateOfMembership.cpp" /> <ClCompile Include="..\..\node\CertificateOfOwnership.cpp" /> - <ClCompile Include="..\..\node\Cluster.cpp" /> <ClCompile Include="..\..\node\Identity.cpp" /> <ClCompile Include="..\..\node\IncomingPacket.cpp" /> <ClCompile Include="..\..\node\InetAddress.cpp" /> @@ -134,7 +133,6 @@ <ClInclude Include="..\..\node\C25519.hpp" /> <ClInclude Include="..\..\node\CertificateOfMembership.hpp" /> <ClInclude Include="..\..\node\CertificateOfOwnership.hpp" /> - <ClInclude Include="..\..\node\Cluster.hpp" /> <ClInclude Include="..\..\node\CMWC4096.hpp" /> <ClInclude Include="..\..\node\Constants.hpp" /> <ClInclude Include="..\..\node\Credential.hpp" /> diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters index cca10f97..086c1043 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters @@ -168,9 +168,6 @@ <ClCompile Include="..\..\node\Path.cpp"> <Filter>Source Files\node</Filter> </ClCompile> - <ClCompile Include="..\..\node\Cluster.cpp"> - <Filter>Source Files\node</Filter> - </ClCompile> <ClCompile Include="..\..\ext\miniupnpc\connecthostport.c"> <Filter>Source Files\ext\miniupnpc</Filter> </ClCompile> @@ -404,9 +401,6 @@ <ClInclude Include="..\..\node\BinarySemaphore.hpp"> <Filter>Header Files\node</Filter> </ClInclude> - <ClInclude Include="..\..\node\Cluster.hpp"> - <Filter>Header Files\node</Filter> - </ClInclude> <ClInclude Include="..\..\node\Hashtable.hpp"> <Filter>Header Files\node</Filter> </ClInclude> |