From 305e372ae2552f1bd16d66658903281a344ac2f4 Mon Sep 17 00:00:00 2001 From: Jesus Pardo Date: Mon, 8 Apr 2024 14:26:11 -0400 Subject: [PATCH 1/2] Fix create provenance generator and push package to azure --- .github/workflows/on-prerelease.yml | 7 +++++-- DataImport.Web/Helpers/JsonValidator.cs | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on-prerelease.yml b/.github/workflows/on-prerelease.yml index 47cc17c4..300d3577 100644 --- a/.github/workflows/on-prerelease.yml +++ b/.github/workflows/on-prerelease.yml @@ -59,7 +59,7 @@ jobs: ./build.ps1 -Command BuildAndPublish ` -Configuration Release ` - -Version $appVersion + -Version $appVersion - name: Setup Nuget.exe uses: nuget/setup-nuget@fd9fffd6ca4541cf4152a9565835ca1a88a6eb37 #v1.1.1 @@ -202,11 +202,13 @@ jobs: actions: read id-token: write contents: write - uses: Ed-Fi-Alliance-OSS/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.5.0 + uses: Ed-Fi-Alliance-OSS/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@main with: base64-subjects: ${{ needs.pack.outputs.hash-code }} attestation-name: DataImport.Web.intoto.jsonl upload-assets: true + # TODO: remove this after this issue is resolved: https://github.com/slsa-framework/slsa-github-generator/issues/876 + compile-generator: true publish-package: name: Publish NuGet Package @@ -230,6 +232,7 @@ jobs: run: | $artifact = (Get-ChildItem -Path $_ -Name -Include *.nupkg) $arguments = @{ + EdFiNuGetFeed = "${{ env.ARTIFACTS_FEED_URL }}" NuGetApiKey = "${{ env.ARTIFACTS_API_KEY }}" } diff --git a/DataImport.Web/Helpers/JsonValidator.cs b/DataImport.Web/Helpers/JsonValidator.cs index 1de26cb4..b97966e7 100644 --- a/DataImport.Web/Helpers/JsonValidator.cs +++ b/DataImport.Web/Helpers/JsonValidator.cs @@ -49,4 +49,3 @@ public bool IsValidJson(string data) } } } - From ea9ebc666a8211a7f22a3fdcc3ed35d07fb3971b Mon Sep 17 00:00:00 2001 From: Jesus Pardo Date: Mon, 8 Apr 2024 16:32:12 -0400 Subject: [PATCH 2/2] Update copyright --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 51058705..e9409bf0 100644 --- a/readme.md +++ b/readme.md @@ -91,7 +91,7 @@ for detailed information on how to contribute source code. ## License -Copyright (c) 2022 Ed-Fi Alliance, LLC and contributors. +Copyright (c) 2024 Ed-Fi Alliance, LLC and contributors. Licensed under the Apache License, Version 2.0 (the "License").