This commit is contained in:
Tim Hess 2018-04-02 09:30:12 -05:00
Родитель eca462ca22
Коммит f2952518ab
14 изменённых файлов: 34 добавлений и 298 удалений

Просмотреть файл

@ -6,68 +6,55 @@ 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.CloudFoundry.ConnectorBase\bin\Release\*.nupkg'
- path: 'src\Steeltoe.CloudFoundry.ConnectorBase\bin\Debug\*.nupkg'
- path: 'src\Steeltoe.CloudFoundry.ConnectorAutofac\bin\Release\*.nupkg'
- path: 'src\Steeltoe.CloudFoundry.ConnectorAutofac\bin\Debug\*.nupkg'
- path: 'src\Steeltoe.CloudFoundry.ConnectorCore\bin\Debug\*.nupkg'
- path: 'src\Steeltoe.CloudFoundry.ConnectorCore\bin\Release\*.nupkg'
- path: 'src\Steeltoe.CloudFoundry.Connector.EF6Core\bin\Debug\*.nupkg'
- path: 'src\Steeltoe.CloudFoundry.Connector.EF6Core\bin\Release\*.nupkg'
- path: 'src\Steeltoe.CloudFoundry.Connector.EFCore\bin\Debug\*.nupkg'
- path: 'src\Steeltoe.CloudFoundry.Connector.EFCore\bin\Release\*.nupkg'
- path: '**\*.nupkg'
environment:
ProjectList: Steeltoe.CloudFoundry.ConnectorBase Steeltoe.CloudFoundry.ConnectorCore Steeltoe.CloudFoundry.Connector.EF6Core Steeltoe.CloudFoundry.Connector.EFCore Steeltoe.CloudFoundry.ConnectorAutofac
PackageReferencesToUpdate: SteeltoeConnectorVersion
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/
server: https://www.myget.org/F/steeltoedev/api/v2/package
symbol_server: https://www.myget.org/F/steeltoedev/symbols/api/v2/package
symbol_server: https://www.myget.org/F/steeltoedev/symbols/api/v2/package
api_key:
secure: 246ApObnMYYvzDo9Ki72CxxuKfuoqYbrbUK2HLevGIGHXYY6f0OkAdE3EWCwNJ7g
on:
branch: dev
appveyor_repo_tag: false
- provider: NuGet
skip_symbols: true
skip_symbols: false
artifact: /.*\.nupkg/
api_key:
secure: RGkpu8xIMDC75IAd1qPRdueeTaYj+ddW2bNEw8S7e81940ELu+WV04uWAzqV34/C
on:
branch: master
appveyor_repo_tag: true
- 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/steeltoemaster/api/v2/package
symbol_server: https://www.myget.org/F/steeltoemaster/symbols/api/v2/package
api_key:
secure: 246ApObnMYYvzDo9Ki72CxxuKfuoqYbrbUK2HLevGIGHXYY6f0OkAdE3EWCwNJ7g
on:
branch: /^update[0-9]{3}/
branch: master
appveyor_repo_tag: false
- provider: NuGet
skip_symbols: true
artifact: /.*\.nupkg/
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: RGkpu8xIMDC75IAd1qPRdueeTaYj+ddW2bNEw8S7e81940ELu+WV04uWAzqV34/C
secure: 246ApObnMYYvzDo9Ki72CxxuKfuoqYbrbUK2HLevGIGHXYY6f0OkAdE3EWCwNJ7g
on:
branch: /^update[0-9]{3}/
appveyor_repo_tag: true
branch: /^update[0-9]{2}x/
appveyor_repo_tag: false
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

Просмотреть файл

@ -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:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then ulimit -n 1024; fi
- git clone https://github.com/SteeltoeOSS/steeltoe-ci.git -v
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then ulimit -n 1024; fi

Просмотреть файл

@ -8,26 +8,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{1CEE3AF7-D
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{3EDCF15E-882C-4AF9-91C6-9A28F2506ACC}"
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", "{FD7D8878-9134-4279-9539-C147326A1C90}"
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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D692D991-D48C-4D23-B373-796D425C7D4B}"
ProjectSection(SolutionItems) = preProject
.appveyor.yml = .appveyor.yml

Просмотреть файл

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="SteeltoeDev" value="https://www.myget.org/F/steeltoedev/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>

Просмотреть файл

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="SteeltoeMaster" value="https://www.myget.org/F/steeltoemaster/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>

Просмотреть файл

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="SteeltoeUpdate" value="https://www.myget.org/F/steeltoeupdates/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>

Просмотреть файл

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>

Просмотреть файл

@ -1,25 +0,0 @@
<Project>
<PropertyGroup>
<SteeltoeVersion>$(STEELTOE_VERSION)</SteeltoeVersion>
<SteeltoeVersionSuffix>$(STEELTOE_DASH_VERSION_SUFFIX)</SteeltoeVersionSuffix>
<SteeltoeConfigVersion>1.1.2-update112-00162</SteeltoeConfigVersion>
<AspNetCoreVersion>1.1.0</AspNetCoreVersion>
<AspNetCoreTestVersion>1.1.2</AspNetCoreTestVersion>
<AspNetCoreMvcTestVersion>1.1.3</AspNetCoreMvcTestVersion>
<AspNetCoreDepTestVersion>1.1.1</AspNetCoreDepTestVersion>
<CoreFxVersion>4.3.0</CoreFxVersion>
<EF6Version>6.1.3</EF6Version>
<EFCoreVersion>1.1.0</EFCoreVersion>
<EFCoreTestVersion>1.1.2</EFCoreTestVersion>
<StackExchangeVersion>1.1.605</StackExchangeVersion>
<MySqlCoreVersion>8.0.8-dmr</MySqlCoreVersion>
<NpgsqlEFCoreVersion>1.1.1</NpgsqlEFCoreVersion>
<RabbitClientVersion>4.1.3</RabbitClientVersion>
<MySqlVersion>6.9.9</MySqlVersion>
<SqlClientVersion>4.4.2</SqlClientVersion>
<JsonNetVersion>9.0.1</JsonNetVersion>
<TestSdkVersion>15.5.0</TestSdkVersion>
<XunitVersion>2.3.1</XunitVersion>
<XunitStudioVersion>2.3.1</XunitStudioVersion>
</PropertyGroup>
</Project>

Просмотреть файл

@ -1,65 +0,0 @@
:: @ECHO OFF
:: Build packages
cd src\Steeltoe.CloudFoundry.ConnectorBase
dotnet restore --configfile ..\..\nuget.config
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" (
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (
dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX%
nuget add "bin\%BUILD_TYPE%\Steeltoe.CloudFoundry.ConnectorBase.%STEELTOE_VERSION%-%STEELTOE_VERSION_SUFFIX%.nupkg" -Source "%USERPROFILE%\localfeed"
) ELSE (
dotnet pack --configuration %BUILD_TYPE%
nuget add "bin\%BUILD_TYPE%\Steeltoe.CloudFoundry.ConnectorBase.%STEELTOE_VERSION%.nupkg" -Source "%USERPROFILE%\localfeed"
)
)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX% --include-symbols --include-source)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (nuget add bin\%BUILD_TYPE%\Steeltoe.CloudFoundry.ConnectorBase.%STEELTOE_VERSION%-%STEELTOE_VERSION_SUFFIX%.nupkg -Source %USERPROFILE%\localfeed)
cd ..\..
cd src\Steeltoe.CloudFoundry.Connector.EFCore
dotnet restore --configfile ..\..\nuget.config
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" (
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (
dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX%
) ELSE (
dotnet pack --configuration %BUILD_TYPE%
)
)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX% --include-symbols --include-source)
cd ..\..
cd src\Steeltoe.CloudFoundry.Connector.EF6Core
dotnet restore --configfile ..\..\nuget.config
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" (
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (
dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX%
) ELSE (
dotnet pack --configuration %BUILD_TYPE%
)
)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX% --include-symbols --include-source)
cd ..\..
cd src\Steeltoe.CloudFoundry.ConnectorCore
dotnet restore --configfile ..\..\nuget.config
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" (
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (
dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX%
) ELSE (
dotnet pack --configuration %BUILD_TYPE%
)
)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX% --include-symbols --include-source)
cd ..\..
cd src\Steeltoe.CloudFoundry.ConnectorAutofac
dotnet restore --configfile ..\..\nuget.config
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" (
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (
dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX%
) ELSE (
dotnet pack --configuration %BUILD_TYPE%
)
)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX% --include-symbols --include-source)
cd ..\..

Просмотреть файл

@ -1,28 +0,0 @@
@ECHO OFF
:: Output dotnet info
dotnet --info
SET CI_BUILD=%APPVEYOR%
SET number=00000%APPVEYOR_BUILD_NUMBER%
SET STEELTOE_VERSION=2.1.0
SET STEELTOE_VERSION_SUFFIX=%APPVEYOR_REPO_BRANCH%-%number:~-5%
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" SET STEELTOE_VERSION_SUFFIX=%APPVEYOR_REPO_TAG_NAME:~6,5%
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (
SET STEELTOE_VERSION_SUFFIX=%STEELTOE_VERSION_SUFFIX: =%
SET STEELTOE_DASH_VERSION_SUFFIX=-%STEELTOE_VERSION_SUFFIX%
) ELSE (
SET STEELTOE_DASH_VERSION_SUFFIX=
)
echo "Version Suffix:" %STEELTOE_VERSION_SUFFIX%
SET BUILD_TYPE=Release
IF "%APPVEYOR_REPO_BRANCH%"=="master" COPY config\nuget-master.config .\nuget.config
IF "%APPVEYOR_REPO_BRANCH%"=="dev" COPY config\nuget-dev.config .\nuget.config
IF "%APPVEYOR_REPO_BRANCH:~0,3%"=="upd" COPY config\nuget-update.config .\nuget.config
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" COPY config\nuget.config .\nuget.config
IF "%APPVEYOR_REPO_BRANCH%"=="master" COPY config\versions-master.props .\versions.props
IF "%APPVEYOR_REPO_BRANCH%"=="dev" COPY config\versions-dev.props .\versions.props
IF "%APPVEYOR_REPO_BRANCH:~0,3%"=="upd" COPY config\versions-update.props .\versions.props
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" COPY config\versions.props .\versions.props
IF "%APPVEYOR_REPO_BRANCH%"=="dev" SET BUILD_TYPE=Debug
mkdir %USERPROFILE%\localfeed
nuget sources add -Name localfeed -Source %USERPROFILE%\localfeed -ConfigFile .\nuget.config

Просмотреть файл

@ -1,39 +0,0 @@
@ECHO OFF
:: Run unit tests
cd test\Steeltoe.CloudFoundry.ConnectorBase.Test
dotnet restore --configfile ..\..\nuget.config
dotnet xunit -verbose
if not "%errorlevel%"=="0" goto failure
cd ..\..
cd test\Steeltoe.CloudFoundry.Connector.EF6Core.Test
dotnet restore --configfile ..\..\nuget.config
dotnet xunit -verbose
if not "%errorlevel%"=="0" goto failure
cd ..\..
cd test\Steeltoe.CloudFoundry.Connector.EFCore.Test
dotnet restore --configfile ..\..\nuget.config
dotnet xunit -verbose
if not "%errorlevel%"=="0" goto failure
cd ..\..
cd test\Steeltoe.CloudFoundry.ConnectorCore.Test
dotnet restore --configfile ..\..\nuget.config
dotnet xunit -verbose
if not "%errorlevel%"=="0" goto failure
cd ..\..
cd test\Steeltoe.CloudFoundry.ConnectorAutofac.Test
dotnet restore --configfile ..\..\nuget.config
dotnet xunit -verbose
if not "%errorlevel%"=="0" goto failure
cd ..\..
echo Unit Tests Pass
goto success
:failure
echo Unit Tests Failure
exit -1
:success

Просмотреть файл

@ -1,20 +0,0 @@
#!/bin/bash
echo Code is built in Unit Tests
cd src/Steeltoe.CloudFoundry.ConnectorBase
dotnet restore --configfile ../../nuget.config
cd ../..
cd src/Steeltoe.CloudFoundry.Connector.EFCore
dotnet restore --configfile ../../nuget.config
cd ../..
cd src/Steeltoe.CloudFoundry.ConnectorCore
dotnet restore --configfile ../../nuget.config
cd ../..
cd src/Steeltoe.CloudFoundry.ConnectorAutofac
dotnet restore --configfile ../../nuget.config
cd ../..

Просмотреть файл

@ -1,14 +0,0 @@
#!/bin/bash
dotnet --info
export CI_BUILD=True
export STEELTOE_VERSION=2.1.0
if [[ "$TRAVIS_BRANCH" == "master" ]]; then cp config/nuget-master.config ./nuget.config ; fi
if [[ "$TRAVIS_BRANCH" == "dev" ]]; then cp config/nuget-dev.config ./nuget.config ; fi
if [[ "${TRAVIS_BRANCH:0:3}" == "upd" ]]; then cp config/nuget-update.config ./nuget.config ; fi
if [[ "$TRAVIS_TAG" != "" ]]; then cp config/nuget.config ./nuget.config ; fi
if [[ "$TRAVIS_BRANCH" == "master" ]]; then cp config/versions-master.props ./versions.props ; fi
if [[ "$TRAVIS_BRANCH" == "dev" ]]; then cp config/versions-dev.props ./versions.props ; fi
if [[ "${TRAVIS_BRANCH:0:3}" == "upd" ]]; then cp config/versions-update.props ./versions.props ; fi
if [[ "$TRAVIS_TAG" != "" ]]; then cp config/versions.props ./versions.props ; fi

Просмотреть файл

@ -1,20 +0,0 @@
#!/bin/bash
# Run unit tests
cd test/Steeltoe.CloudFoundry.ConnectorBase.Test
dotnet restore --configfile ../../nuget.config
dotnet xunit -verbose -framework netcoreapp2.0
if [[ $? != 0 ]]; then exit 1 ; fi
cd ../..
cd test/Steeltoe.CloudFoundry.Connector.EFCore.Test
dotnet restore --configfile ../../nuget.config
dotnet xunit -verbose -framework netcoreapp2.0
if [[ $? != 0 ]]; then exit 1 ; fi
cd ../..
cd test/Steeltoe.CloudFoundry.ConnectorCore.Test
dotnet restore --configfile ../../nuget.config
dotnet xunit -verbose -framework netcoreapp2.0
if [[ $? != 0 ]]; then exit 1 ; fi
cd ../..