use the new CI process [#153640396]

SteeltoeOSS · Apr 2, 2018 · 391f7d7 · 391f7d7
1 parent a9c5e11
commit 391f7d7
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 338 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -6,37 +6,22 @@ branches:
   only:
     - master
     - dev
-    - /^update[0-9]{3}/    
+    - /^update[0-9]{2}x/          
 install:
-  - scripts\appveyor_install.cmd
+  - git clone https://github.com/SteeltoeOSS/steeltoe-ci.git -v
+  - ps: steeltoe-ci\scripts\appveyor_install.ps1
 test_script:
-  - scripts\appveyor_tests.cmd
+  - ps: steeltoe-ci\scripts\appveyor_tests.ps1
 build_script:
-  - scripts\appveyor_build.cmd
+  - ps: steeltoe-ci\scripts\appveyor_build.ps1
 artifacts:
-- path: 'src\Steeltoe.Extensions.Configuration.ConfigServerBase\bin\Release\*.nupkg'
-- path: 'src\Steeltoe.Extensions.Configuration.ConfigServerCore\bin\Release\*.nupkg'
-- path: 'src\Steeltoe.Extensions.Configuration.ConfigServerAutofac\bin\Release\*.nupkg'
-- path: 'src\Steeltoe.Extensions.Configuration.CloudFoundryBase\bin\Release\*.nupkg'
-- path: 'src\Steeltoe.Extensions.Configuration.CloudFoundryCore\bin\Release\*.nupkg'
-- path: 'src\Steeltoe.Extensions.Configuration.CloudFoundryAutofac\bin\Release\*.nupkg'
-- path: 'src\Steeltoe.Extensions.Configuration.ConfigServerBase\bin\Debug\*.nupkg'
-- path: 'src\Steeltoe.Extensions.Configuration.ConfigServerCore\bin\Debug\*.nupkg'
-- path: 'src\Steeltoe.Extensions.Configuration.ConfigServerAutofac\bin\Debug\*.nupkg'
-- path: 'src\Steeltoe.Extensions.Configuration.CloudFoundryBase\bin\Debug\*.nupkg'
-- path: 'src\Steeltoe.Extensions.Configuration.CloudFoundryCore\bin\Debug\*.nupkg'
-- path: 'src\Steeltoe.Extensions.Configuration.CloudFoundryAutofac\bin\Debug\*.nupkg'
+  - path: '**\*.nupkg'
+environment:
+  ProjectList: Steeltoe.Extensions.Configuration.CloudFoundryBase Steeltoe.Extensions.Configuration.ConfigServerBase Steeltoe.Extensions.Configuration.CloudFoundryCore Steeltoe.Extensions.Configuration.CloudFoundryAutofac Steeltoe.Extensions.Configuration.ConfigServerCore Steeltoe.Extensions.Configuration.ConfigServerAutofac
+  PackageReferencesToUpdate: SteeltoeConfigVersion
+  github_access_token:
+    secure: ko4J3M/czguVI9AbVdkv5qZuj3Wuzts5nkz/6cypneFkQGWJXDs8Akg7xOEMu8qU
 deploy:
-- provider: NuGet
-  skip_symbols: false
-  artifact: /.*\.nupkg/
-  server: https://www.myget.org/F/steeltoemaster/api/v2/package
-  symbol_server: https://www.myget.org/F/steeltoemaster/symbols/api/v2/package
-  api_key:
-    secure: 246ApObnMYYvzDo9Ki72CxxuKfuoqYbrbUK2HLevGIGHXYY6f0OkAdE3EWCwNJ7g
-  on:
-    branch: master
-    appveyor_repo_tag: false
 - provider: NuGet
   skip_symbols: false
   artifact: /.*\.nupkg/
@@ -48,28 +33,28 @@ deploy:
     branch: dev
     appveyor_repo_tag: false
 - provider: NuGet
-  skip_symbols: true
+  skip_symbols: false
   artifact: /.*\.nupkg/
+  server: https://www.myget.org/F/steeltoemaster/api/v2/package
+  symbol_server: https://www.myget.org/F/steeltoemaster/symbols/api/v2/package
   api_key:
-    secure: RGkpu8xIMDC75IAd1qPRdueeTaYj+ddW2bNEw8S7e81940ELu+WV04uWAzqV34/C
+    secure: 246ApObnMYYvzDo9Ki72CxxuKfuoqYbrbUK2HLevGIGHXYY6f0OkAdE3EWCwNJ7g
   on:
     branch: master
-    appveyor_repo_tag: true
+    appveyor_repo_tag: false
 - provider: NuGet
   skip_symbols: true
   artifact: /.*\.nupkg/
-  server: https://www.myget.org/F/steeltoeupdates/api/v2/package
-  symbol_server: https://www.myget.org/F/steeltoeupdates/symbols/api/v2/package
+  server: https://www.myget.org/F/steeltoestaging/api/v2/package
+  symbol_server: https://www.myget.org/F/steeltoestaging/symbols/api/v2/package
   api_key:
     secure: 246ApObnMYYvzDo9Ki72CxxuKfuoqYbrbUK2HLevGIGHXYY6f0OkAdE3EWCwNJ7g
   on:
-    branch: /^update[0-9]{3}/
+    branch: /^update[0-9]{2}x/
     appveyor_repo_tag: false
-- provider: NuGet
-  skip_symbols: true
-  artifact: /.*\.nupkg/
-  api_key:
-    secure: RGkpu8xIMDC75IAd1qPRdueeTaYj+ddW2bNEw8S7e81940ELu+WV04uWAzqV34/C
-  on:
-    branch:  /^update[0-9]{3}/
-    appveyor_repo_tag: true        
+after_deploy:
+  - git config --global credential.helper store
+  - ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:github_access_token):x-oauth-basic@github.com`n"
+  - git config --global user.email "steeltoe@pivotal.io"
+  - git config --global user.name "SteeltoeCI"
+  - ps: steeltoe-ci\scripts\update_downstream_props.ps1
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: csharp
 dist: trusty
 env:
+  STEELTOE_VERSION: 2.1.0
   global:
     - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
     - DOTNET_CLI_TELEMETRY_OPTOUT: 1
@@ -14,10 +15,11 @@ branches:
   only:
     - master
     - dev
-    - /^update[0-9]{3}/    
+    - /^update[0-9]{2}x/         
 script:
-  - ./scripts/travis_install.sh
-  - ./scripts/travis_build.sh
-  - ./scripts/travis_test.sh
+  - ./steeltoe-ci/scripts/travis_install.sh
+  - ./steeltoe-ci/scripts/travis_build.sh
+  - ./steeltoe-ci/scripts/travis_test.sh
 before_install:
+  - git clone https://github.com/SteeltoeOSS/steeltoe-ci.git -v
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ulimit -n 1024; fi
diff --git a/Configuration.sln b/Configuration.sln
@@ -9,26 +9,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{17EC73D7-8
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{2D89EFD8-0718-443C-B615-AF6C4D6DFB8D}"
 	ProjectSection(SolutionItems) = preProject
-		config\nuget-dev.config = config\nuget-dev.config
-		config\nuget-master.config = config\nuget-master.config
-		config\nuget-update.config = config\nuget-update.config
-		config\nuget.config = config\nuget.config
 		config\versions-dev.props = config\versions-dev.props
 		config\versions-master.props = config\versions-master.props
-		config\versions-update.props = config\versions-update.props
 		config\versions.props = config\versions.props
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{A2BB79F8-B551-4385-9280-9396064C82C2}"
-	ProjectSection(SolutionItems) = preProject
-		scripts\appveyor_build.cmd = scripts\appveyor_build.cmd
-		scripts\appveyor_install.cmd = scripts\appveyor_install.cmd
-		scripts\appveyor_tests.cmd = scripts\appveyor_tests.cmd
-		scripts\travis_build.sh = scripts\travis_build.sh
-		scripts\travis_install.sh = scripts\travis_install.sh
-		scripts\travis_test.sh = scripts\travis_test.sh
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Extensions.Configuration.CloudFoundryAutofac", "src\Steeltoe.Extensions.Configuration.CloudFoundryAutofac\Steeltoe.Extensions.Configuration.CloudFoundryAutofac.csproj", "{B5189734-AA9B-4B98-ADBE-16EF97F0C12D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Extensions.Configuration.CloudFoundryCore", "src\Steeltoe.Extensions.Configuration.CloudFoundryCore\Steeltoe.Extensions.Configuration.CloudFoundryCore.csproj", "{E65847A5-6D5C-4510-AFF6-D12FD3146555}"

diff --git a/config/nuget-dev.config b/config/nuget-dev.config
diff --git a/config/nuget-master.config b/config/nuget-master.config
diff --git a/config/nuget-update.config b/config/nuget-update.config
diff --git a/config/nuget.config b/config/nuget.config
diff --git a/config/versions-update.props b/config/versions-update.props
diff --git a/scripts/appveyor_build.cmd b/scripts/appveyor_build.cmd
diff --git a/scripts/appveyor_install.cmd b/scripts/appveyor_install.cmd
diff --git a/scripts/appveyor_tests.cmd b/scripts/appveyor_tests.cmd
diff --git a/scripts/travis_build.sh b/scripts/travis_build.sh
diff --git a/scripts/travis_install.sh b/scripts/travis_install.sh