From 36b0ba4bb5ceb55cf00efe09056bb953f62e23c1 Mon Sep 17 00:00:00 2001 From: Dylan Perks <11160611+Perksey@users.noreply.github.com> Date: Mon, 9 Aug 2021 15:03:46 +0100 Subject: [PATCH 1/4] Update deploy.yml --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0ce40a7da5..2a7bb0d67c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -29,6 +29,7 @@ jobs: retention-days: 1 - name: Push to NuGet run: nuke PushToNuGet --skip Clean Restore Pack --configuration Release --msbuild-properties ContinuousIntegrationBuild=true SilkEnableSourceLink=true --feature-sets Android iOS --nuget-api-key ${{ secrets.NUGET_TOKEN }} --sign-username "${{ secrets.SIGN_USERNAME }}" --sign-password "${{ secrets.SIGN_PASSWORD }}" + continue-on-error: true - name: Upload Signed Artifacts to Actions uses: actions/upload-artifact@v2.2.4 with: From 95dbc8744aca5c75a4ccf92e41620c649f4f4857 Mon Sep 17 00:00:00 2001 From: Dylan Perks Date: Mon, 9 Aug 2021 16:39:52 +0100 Subject: [PATCH 2/4] Sign one at a time maybe? --- build/nuke/Build.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/nuke/Build.cs b/build/nuke/Build.cs index 5cdb87e162..031c2e3f16 100644 --- a/build/nuke/Build.cs +++ b/build/nuke/Build.cs @@ -443,12 +443,13 @@ async Task PushPackages() DotNetToolInstall(s => s.SetToolInstallationPath(basePath / "tool").SetPackageName("SignClient")); } + foreach (var pkg in Packages) StartProcess ( execPath, "sign " + $"--baseDirectory {PackageDirectory} " + - "--input \"**/*.nupkg\" " + + $"--input \"{pkg}\" " + $"--config \"{basePath / "config.json"}\" " + $"--filelist \"{basePath / "filelist.txt"}\" " + $"--user \"{SignUsername}\" " + From 9c2cf013895f98e0d7f8c9791b8babd55a690307 Mon Sep 17 00:00:00 2001 From: Dylan Perks Date: Mon, 9 Aug 2021 17:10:51 +0100 Subject: [PATCH 3/4] It worked, fixes for PR --- .github/workflows/deploy.yml | 2 +- build/nuke/Build.cs | 30 ++++++++++++++++-------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2a7bb0d67c..c012faf9d2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -33,6 +33,6 @@ jobs: - name: Upload Signed Artifacts to Actions uses: actions/upload-artifact@v2.2.4 with: - name: unsigned_nupkgs + name: signed_nupkgs path: "build/output_packages/*.nupkg" if-no-files-found: warn diff --git a/build/nuke/Build.cs b/build/nuke/Build.cs index 031c2e3f16..c15d97b7b3 100644 --- a/build/nuke/Build.cs +++ b/build/nuke/Build.cs @@ -444,20 +444,22 @@ async Task PushPackages() } foreach (var pkg in Packages) - StartProcess - ( - execPath, - "sign " + - $"--baseDirectory {PackageDirectory} " + - $"--input \"{pkg}\" " + - $"--config \"{basePath / "config.json"}\" " + - $"--filelist \"{basePath / "filelist.txt"}\" " + - $"--user \"{SignUsername}\" " + - $"--secret \"{SignPassword}\" " + - "--name \"Silk.NET\" " + - "--description \"Silk.NET\" " + - "--descriptionUrl \"https://github.com/dotnet/Silk.NET\"" - ).AssertZeroExitCode(); + { + StartProcess + ( + execPath, + "sign " + + $"--baseDirectory {PackageDirectory} " + + $"--input \"{pkg}\" " + + $"--config \"{basePath / "config.json"}\" " + + $"--filelist \"{basePath / "filelist.txt"}\" " + + $"--user \"{SignUsername}\" " + + $"--secret \"{SignPassword}\" " + + "--name \"Silk.NET\" " + + "--description \"Silk.NET\" " + + "--descriptionUrl \"https://github.com/dotnet/Silk.NET\"" + ).AssertZeroExitCode(); + } } var allFiles = Packages.Select((x, i) => new {Index = i, Value = x}) From 45cd2564d3f1935d9f800c2d0ccfd2dcc58b1137 Mon Sep 17 00:00:00 2001 From: Dylan Perks Date: Mon, 9 Aug 2021 17:11:36 +0100 Subject: [PATCH 4/4] cont'd --- .github/workflows/deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c012faf9d2..ef20681386 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -29,7 +29,6 @@ jobs: retention-days: 1 - name: Push to NuGet run: nuke PushToNuGet --skip Clean Restore Pack --configuration Release --msbuild-properties ContinuousIntegrationBuild=true SilkEnableSourceLink=true --feature-sets Android iOS --nuget-api-key ${{ secrets.NUGET_TOKEN }} --sign-username "${{ secrets.SIGN_USERNAME }}" --sign-password "${{ secrets.SIGN_PASSWORD }}" - continue-on-error: true - name: Upload Signed Artifacts to Actions uses: actions/upload-artifact@v2.2.4 with: