@joebigelow / wix / commits / 42b7ac1d

Push WiX v4 .nupkgs to GitHub Packages

Rob Mensching committed Jan 3, 2022 at 09:37 UTC 42b7ac1da504dbdf76247bb96e356c9e29b22248
2 files changed +15 -7
.github/workflows/build.yml
+7 -3
@@ -48,14 +48,18 @@ jobs:
48 name: artifacts
49 path: build/artifacts/
50
51 - - name: Zip temp logs
51 + - name: Collect integration test logs
52 + if: always()
53 shell: cmd
54 run: 7z a "build\logs\test_burn_%GITHUB_RUN_ID%.zip" "%TEMP%\*.log" "%TEMP%\..\*.log"
54 - if: always()
55
56 - name: Save logs
57 - uses: actions/upload-artifact@v2
57 if: always()
58 + uses: actions/upload-artifact@v2
59 with:
60 name: logs_${{ github.run_id }}
61 path: build/logs/
62 +
63 + - name: Push to GitHub Packages
64 + if: ${{ github.event_name == 'push' && github.repository_owner == 'wixtoolset' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop') }}
65 + run: dotnet nuget push "build/artifacts/**/*.nupkg" --source https://nuget.pkg.github.com/wixtoolset/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
src/Directory.Build.targets
+8 -4
@@ -38,6 +38,13 @@
38 <InformationalVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)+$(GitSha)</InformationalVersion>
39 <!-- We already included the $(GitSha) in the informational version so do not include it again. -->
40 <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
41 +
42 + <RepositoryUrl Condition=" '$(RepositoryUrl)'=='' and '$(GitRepositoryUrl)'!='' ">$(GitRepositoryUrl.Replace('.git',''))</RepositoryUrl>
43 + <RepositoryType Condition=" '$(RepositoryType)'=='' ">git</RepositoryType>
44 + <RepositoryCommit Condition=" '$(RepositoryCommit)'=='' ">$(GitSha)</RepositoryCommit>
45 + <PublishRepositoryUrl>true</PublishRepositoryUrl>
46 +
47 + <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(RepositoryUrl)'!='' ">$(RepositoryUrl)</ProjectUrl>
48 </PropertyGroup>
49
50 <Message Importance="$(GitInfoReportImportance)" Text="Properties from Git:
@@ -60,17 +67,14 @@
67 <Target Name="__SetNuspecProperties" DependsOnTargets="__SetPropertiesFromGit"
68 Condition=" Exists('$(MSBuildProjectName).nuspec') ">
69 <PropertyGroup>
63 - <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(GitRepositoryUrl)'!='' ">$(GitRepositoryUrl.Replace('.git',''))</ProjectUrl>
64 -
70 <NuspecFile Condition=" '$(NuspecFile)'=='' ">$(MSBuildProjectName).nuspec</NuspecFile>
71 <PackageId Condition=" '$(PackageId)'=='' ">$(MSBuildProjectName)</PackageId>
72 <Title Condition=" '$(Title)'=='' ">$(Description)</Title>
73 <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)</NuspecBasePath>
74 <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Version=$(PackageVersion);Authors=$(Authors);Configuration=$(Configuration)</NuspecProperties>
75 <NuspecProperties>$(NuspecProperties);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
71 - <NuspecProperties>$(NuspecProperties);RepositoryType=git;RepositoryCommit=$(GitSha);RepositoryUrl=$(GitRepositoryUrl)</NuspecProperties>
76 + <NuspecProperties>$(NuspecProperties);RepositoryType=$(RepositoryType);RepositoryCommit=$(RepositoryCommit);RepositoryUrl=$(RepositoryUrl)</NuspecProperties>
77 <NuspecProperties>$(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory)</NuspecProperties>
73 - <PublishRepositoryUrl>true</PublishRepositoryUrl>
78 <SymbolPackageFormat>snupkg</SymbolPackageFormat>
79 </PropertyGroup>
80