From 6bc891b019432820b1c1160a79ad44d3ece70897 Mon Sep 17 00:00:00 2001 From: Vince Grassia <593223+vgrassia@users.noreply.github.com> Date: Tue, 20 Feb 2024 12:15:29 -0500 Subject: [PATCH 1/4] Update build command --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ba9b597..d159509 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,7 @@ jobs: echo "### Building self contained binary for $RID to $OUTPUT_DIR" dotnet publish -c Release -p:PublishDir=$OUTPUT_DIR -r $RID \ -p:PublishReadyToRun=true -p:PublishSingleFile=true \ - -p:DebugType=None -p:DebugSymbols=false -p:PublishTrimmed=true \ + -p:DebugType=None -p:DebugSymbols=false \ --self-contained true -p:IncludeNativeLibrariesForSelfExtract=true \ -p:EnableCompressionInSingleFile=true cd $OUTPUT_DIR From 48aa5e9b88a08baa454a38d77ae15b3f0cc023c5 Mon Sep 17 00:00:00 2001 From: Vince Grassia <593223+vgrassia@users.noreply.github.com> Date: Tue, 20 Feb 2024 12:23:23 -0500 Subject: [PATCH 2/4] Add test logic --- .github/workflows/build.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d159509..88a2842 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,6 +54,8 @@ jobs: -p:DebugType=None -p:DebugSymbols=false \ --self-contained true -p:IncludeNativeLibrariesForSelfExtract=true \ -p:EnableCompressionInSingleFile=true + pwd + ls -R build cd $OUTPUT_DIR FILENAME=$(ls hbs*) SUFFIX=${FILENAME#hbs} @@ -79,13 +81,15 @@ jobs: -p:PublishReadyToRun=true -p:PublishSingleFile=true \ -p:DebugType=None -p:DebugSymbols=false \ --self-contained false -p:IncludeNativeLibrariesForSelfExtract=true - cd $OUTPUT_DIR - FILENAME=$(ls hbs*) - SUFFIX=${FILENAME#hbs} - NEW_FILENAME="hbs_${RID}_dotnet${SUFFIX}" - mv -- "$FILENAME" "$NEW_FILENAME" - zip -j hbs_${RID}_dotnet.zip $NEW_FILENAME - rm $NEW_FILENAME + pwd + ls -R build + # cd $OUTPUT_DIR + # FILENAME=$(ls hbs*) + # SUFFIX=${FILENAME#hbs} + # NEW_FILENAME="hbs_${RID}_dotnet${SUFFIX}" + # mv -- "$FILENAME" "$NEW_FILENAME" + # zip -j hbs_${RID}_dotnet.zip $NEW_FILENAME + # rm $NEW_FILENAME - name: Upload Framework Dependent artifact (${{ matrix.rid }}) uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 From 43d9e5b4a5183e75529d50fd342d708d89ec1ed6 Mon Sep 17 00:00:00 2001 From: Vince Grassia <593223+vgrassia@users.noreply.github.com> Date: Tue, 20 Feb 2024 12:32:37 -0500 Subject: [PATCH 3/4] Fix publish commands --- .github/workflows/build.yml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 88a2842..49517b0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,11 +49,9 @@ jobs: run: | OUTPUT_DIR="$(pwd)/build/sc/$RID" echo "### Building self contained binary for $RID to $OUTPUT_DIR" - dotnet publish -c Release -p:PublishDir=$OUTPUT_DIR -r $RID \ - -p:PublishReadyToRun=true -p:PublishSingleFile=true \ - -p:DebugType=None -p:DebugSymbols=false \ - --self-contained true -p:IncludeNativeLibrariesForSelfExtract=true \ - -p:EnableCompressionInSingleFile=true + dotnet publish -c Release -r $RID --self-contained true -p:PublishDir=$OUTPUT_DIR -p:PublishReadyToRun=true \ + -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false \ + -p:IncludeNativeLibrariesForSelfExtract=true -p:EnableCompressionInSingleFile=true pwd ls -R build cd $OUTPUT_DIR @@ -77,19 +75,17 @@ jobs: run: | OUTPUT_DIR="$(pwd)/build/fd/$RID" echo "### Building framework dependent binary for $RID to $OUTPUT_DIR" - dotnet publish -c Release -p:PublishDir=$OUTPUT_DIR -r $RID \ - -p:PublishReadyToRun=true -p:PublishSingleFile=true \ - -p:DebugType=None -p:DebugSymbols=false \ - --self-contained false -p:IncludeNativeLibrariesForSelfExtract=true + dotnet publish -c Release -r $RID --self-contained false -p:PublishDir=$OUTPUT_DIR -p:PublishSingleFile=true \ + -p:DebugType=None -p:DebugSymbols=false -p:IncludeNativeLibrariesForSelfExtract=true pwd ls -R build - # cd $OUTPUT_DIR - # FILENAME=$(ls hbs*) - # SUFFIX=${FILENAME#hbs} - # NEW_FILENAME="hbs_${RID}_dotnet${SUFFIX}" - # mv -- "$FILENAME" "$NEW_FILENAME" - # zip -j hbs_${RID}_dotnet.zip $NEW_FILENAME - # rm $NEW_FILENAME + cd $OUTPUT_DIR + FILENAME=$(ls hbs*) + SUFFIX=${FILENAME#hbs} + NEW_FILENAME="hbs_${RID}_dotnet${SUFFIX}" + mv -- "$FILENAME" "$NEW_FILENAME" + zip -j hbs_${RID}_dotnet.zip $NEW_FILENAME + rm $NEW_FILENAME - name: Upload Framework Dependent artifact (${{ matrix.rid }}) uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 From c5396524a5f433fb00b52ebb512636ace0d49792 Mon Sep 17 00:00:00 2001 From: Vince Grassia <593223+vgrassia@users.noreply.github.com> Date: Tue, 20 Feb 2024 13:44:05 -0500 Subject: [PATCH 4/4] Remove test logic --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49517b0..056e0bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,8 +52,6 @@ jobs: dotnet publish -c Release -r $RID --self-contained true -p:PublishDir=$OUTPUT_DIR -p:PublishReadyToRun=true \ -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false \ -p:IncludeNativeLibrariesForSelfExtract=true -p:EnableCompressionInSingleFile=true - pwd - ls -R build cd $OUTPUT_DIR FILENAME=$(ls hbs*) SUFFIX=${FILENAME#hbs} @@ -77,8 +75,6 @@ jobs: echo "### Building framework dependent binary for $RID to $OUTPUT_DIR" dotnet publish -c Release -r $RID --self-contained false -p:PublishDir=$OUTPUT_DIR -p:PublishSingleFile=true \ -p:DebugType=None -p:DebugSymbols=false -p:IncludeNativeLibrariesForSelfExtract=true - pwd - ls -R build cd $OUTPUT_DIR FILENAME=$(ls hbs*) SUFFIX=${FILENAME#hbs}