Unified the CI pipeline into a single file

Pushing and releasing ran different CI so I changed that
ByronMayne · Jan 21, 2024 · f1f4dac · f1f4dac
1 parent 393c31f
commit f1f4dac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 31 deletions.
diff --git a/.github/workflows/publish_release.yml → .github/workflows/ci.yml b/.github/workflows/publish_release.yml → .github/workflows/ci.yml
@@ -2,6 +2,9 @@ name: Publish
 on:
   release: 
     types: [published]
+  push: {}
+  pull_request: {}
+
 env:
   Configuration: Release
   ProjectDir: src\SourceGenerator.Foundations\
@@ -30,5 +33,7 @@ jobs:
         run: dotnet test ${{env.SolutionPath}}
       - name: Build 
         run: dotnet build ${{env.SolutionPath}} -t:pack -p:PackageVersion=${{env.GitVersion_SemVer}} --configuration ${{env.Configuration}}
+      # -- Release Only --
       - name: Push NuGet
+        if: ${{ github.event_name == 'release' }} 
         run: dotnet nuget push ${{env.ProjectDir}}bin\${{env.Configuration}}\*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_API_KEY}}  --source https://api.nuget.org/v3/index.json
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
diff --git a/src/SourceGenerator.Foundations/SourceGenerator.Foundations.targets b/src/SourceGenerator.Foundations/SourceGenerator.Foundations.targets
@@ -6,7 +6,7 @@
     won't exist.
    ==================================================-->
   <!-- TaskFactory is set to 'TaskHostFactory' so that we don't get the 'dll' is locked error -->
-  <UsingTask TaskName="FilterAssembliesTask"  AssemblyFile="$(SGFMsBuildPath)" TaskFactory="TaskHostFactory"/>
+  <UsingTask TaskName="FilterAssembliesTask" AssemblyFile="$(SGFMsBuildPath)" TaskFactory="TaskHostFactory"/>
   <Target Name="SGF_EmbedDependencies" AfterTargets="ResolveAssemblyReferences">
     <FilterAssembliesTask Assemblies="@(ReferencePath->'%(RootDir)%(Directory)%(Filename)%(Extension)')">
       <Output TaskParameter="FilteredAssemblies" ItemName="SGF_FilteredAssembly" />