From e0e06582c5324af27936393c7a9e3dc148f5a044 Mon Sep 17 00:00:00 2001
From: Patrick Stevens <3138005+Smaug123@users.noreply.github.com>
Date: Mon, 17 Jun 2024 22:09:38 +0100
Subject: [PATCH] More pipeline fixes (#11)

---
 .github/workflows/assert-contents.sh | 4 ++++
 .github/workflows/nuget-push.sh      | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/assert-contents.sh b/.github/workflows/assert-contents.sh
index 1300124..223f314 100644
--- a/.github/workflows/assert-contents.sh
+++ b/.github/workflows/assert-contents.sh
@@ -1,7 +1,11 @@
 #!/bin/bash
 
+echo "Unzipping version from NuGet"
+ls from-nuget.nupkg
 mkdir from-nuget && cp from-nuget.nupkg from-nuget/zip.zip && cd from-nuget && unzip zip.zip && cd - || exit 1
 
+echo "Unzipping version from local build"
+ls packed/
 mkdir from-local && cp packed/*.nupkg from-local/zip.zip && cd from-local && unzip zip.zip && cd - || exit 1
 
 find from-local -type f -exec sha256sum {} \; | sort > from-local.txt
diff --git a/.github/workflows/nuget-push.sh b/.github/workflows/nuget-push.sh
index fe05686..af0355d 100644
--- a/.github/workflows/nuget-push.sh
+++ b/.github/workflows/nuget-push.sh
@@ -8,7 +8,7 @@ echo "version=$PACKAGE_VERSION" >> "$GITHUB_OUTPUT"
 
 tmp=$(mktemp)
 
-if ! dotnet nuget push "$SOURCE_NUPKG" --api-key "$NUGET_API_KEY" --source https://api.nuget.org/v3/index.json --skip-duplicate > "$tmp" ; then
+if ! dotnet nuget push "$SOURCE_NUPKG" --api-key "$NUGET_API_KEY" --source https://api.nuget.org/v3/index.json > "$tmp" ; then
     cat "$tmp"
     if grep 'already exists at feed' "$tmp" ; then
         echo "result=skipped" >> "$GITHUB_OUTPUT"
@@ -19,4 +19,6 @@ if ! dotnet nuget push "$SOURCE_NUPKG" --api-key "$NUGET_API_KEY" --source https
     fi
 fi
 
+cat "$tmp"
+
 echo "result=published" >> "$GITHUB_OUTPUT"