Revert "Revert "chore: simplify the build-test-pack-release process (#…

…535)"" This reverts commit 79af4fa.
twilio · Aug 24, 2020 · 7ce4526 · 7ce4526
1 parent 79af4fa
commit 7ce4526
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 131 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,28 +1,31 @@
 language: csharp
 solution: Twilio.sln
-dist: xenial
-sudo: required
-mono: none
-dotnet: 2.1
+mono: latest
+dotnet: 3.1
+
+env:
+  - FrameworkPathOverride=/usr/lib/mono/4.5/
 
 services:
   - docker
 
-install:
-  - dotnet restore
-  - dotnet build --framework netstandard1.4 src/Twilio/Twilio.csproj
-  - dotnet build --framework netstandard2.0 src/Twilio/Twilio.csproj
-  - dotnet build --framework netcoreapp2.0 test/Twilio.Test/Twilio.Test.csproj
-
 script:
-  - dotnet run --framework netcoreapp2.0 --project test/Twilio.Test/Twilio.Test.csproj
+  - make test
+  - make release
 
 deploy:
-  provider: script
-  script: make docker-build && make docker-push
-  skip_cleanup: true
-  on:
-    tags: true
+  - provider: script
+    script: make docker-build && make docker-push
+    skip_cleanup: true
+    on:
+      branch: main
+      tags: true
+  - provider: script
+    script: dotnet nuget push **/*.nupkg -k $NUGET_API_KEY -s https://api.nuget.org/v3/index.json
+    skip_cleanup: true
+    on:
+      branch: main
+      tags: true
 
 notifications:
   slack:

diff --git a/Makefile b/Makefile
@@ -8,15 +8,11 @@ install:
 	dotnet restore
 
 test:
-	dotnet restore
-	dotnet build --framework netstandard1.4 src/Twilio/Twilio.csproj
-	dotnet build --framework netstandard2.0 src/Twilio/Twilio.csproj
-	dotnet build --framework netcoreapp2.0 test/Twilio.Test/Twilio.Test.csproj
-	dotnet run --framework netcoreapp2.0 --project test/Twilio.Test/Twilio.Test.csproj
-
-release: test
 	dotnet build -c Release
-	dotnet pack src/Twilio/Twilio.csproj -c Release -o .
+	dotnet test -c Release
+
+release:
+	dotnet pack -c Release
 
 docs:
 	doxygen Doxyfile

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/build.ps1 b/build.ps1
diff --git a/test/Twilio.Test/Twilio.Test.csproj b/test/Twilio.Test/Twilio.Test.csproj
@@ -5,6 +5,7 @@
     <TargetFrameworks>netcoreapp2.0;net451;net35</TargetFrameworks>
     <RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net451' ">win7-x86</RuntimeIdentifier>
     <RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net35' ">win7-x86</RuntimeIdentifier>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.6.0" />