Update release workflow to build the reporter before packaging tools

icerpc · Sep 16, 2024 · a2d6c79 · a2d6c79
1 parent 37e9dc6
commit a2d6c79
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -80,11 +80,16 @@ jobs:
           # Copy the compiler to the expected location to avoid rebuilding it when creating the NuGet packages
           New-Item -ItemType Directory -Path "$env:GITHUB_WORKSPACE\tools\slicec-cs\target\release"
           Copy-Item "slicec-cs-x86_64-pc-windows-msvc\slicec-cs.exe" -Destination "$env:GITHUB_WORKSPACE\tools\slicec-cs\target\release"
+      - name: Build IceRPC Tools
+        working-directory: tools
+        run: dotnet build --configuration Release
+        env:
+          SLICEC_CS_STAGING_PATH: ${{ github.workspace }}\tools\slicec-cs\staging
+      - name: Build IceRPC
+        run: dotnet build --configuration Release --output .
       - name: Pack IceRPC Tools
         working-directory: tools
-        run: |
-          dotnet build --configuration Release
-          dotnet pack --configuration Release --output ../
+        run: dotnet pack --configuration Release --output ../
         env:
           SLICEC_CS_STAGING_PATH: ${{ github.workspace }}\tools\slicec-cs\staging
       - name: Pack IceRPC

diff --git a/build.sh b/build.sh
@@ -89,7 +89,7 @@ publish()
     global_packages=$(dotnet nuget locals -l global-packages)
     global_packages=${global_packages/global-packages: /""}
     run_command rm "-rf" "$global_packages/zeroc.slice/$version" "$global_packages/icerpc/$version" "$global_packages"/icerpc.*/"$version"
-    run_command dotnet "nuget" "push" "tools/**/$dotnet_config/*.$version.nupkg" "--source" "$global_packages"
+    run_command dotnet "nuget" "push" "tools/**/$dotnet_config/*.$version*.nupkg" "--source" "$global_packages"
     run_command dotnet "nuget" "push" "src/**/$dotnet_config/*.$version.nupkg" "--source" "$global_packages"
 }
 

diff --git a/build/IceRpc.Version.props b/build/IceRpc.Version.props
@@ -2,6 +2,8 @@
   <PropertyGroup>
     <!-- The version of all assembly files built in this repository -->
     <Version Condition="'$(Version)' == ''">0.4.0</Version>
+    <IceRpcProtobufToolsVersion>0.4.0.1</IceRpcProtobufToolsVersion>
+    <IceRpcSliceToolsVersion>0.4.0.1</IceRpcSliceToolsVersion>
     <!-- The Protobuf version used by IceRpc.Protobuf -->
     <ProtobufVersion>28.1</ProtobufVersion>
     <NuGetProtobufVersion>3.$(ProtobufVersion)</NuGetProtobufVersion>

diff --git a/tools/IceRpc.Protobuf.Tools/IceRpc.Protobuf.Tools.csproj b/tools/IceRpc.Protobuf.Tools/IceRpc.Protobuf.Tools.csproj
@@ -31,6 +31,7 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <NoWarn>NU5100</NoWarn>
+    <Version>$(IceRpcProtobufToolsVersion)</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Framework" Version="17.11.4" />

diff --git a/tools/IceRpc.Slice.Tools/IceRpc.Slice.Tools.csproj b/tools/IceRpc.Slice.Tools/IceRpc.Slice.Tools.csproj
@@ -31,6 +31,7 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <NoWarn>NU5100</NoWarn>
+    <Version>$(IceRpcSliceToolsVersion)</Version>
     <RustConfiguration Condition="'$(Configuration)' == 'Release'">release</RustConfiguration>
     <RustConfiguration Condition="'$(Configuration)' == 'Debug'">debug</RustConfiguration>
     <SliceCompilerExe Condition="'$(OS)' == 'Windows_NT'">slicec-cs.exe</SliceCompilerExe>