From 4a87fa14e582949fc8e8859793e71fddb4de166b Mon Sep 17 00:00:00 2001 From: Axel Marquez Date: Thu, 14 Mar 2024 12:40:01 -0600 Subject: [PATCH 1/6] Update informational version in GH workflow --- .github/workflows/Lib edFi.ods.common pullrequest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Lib edFi.ods.common pullrequest.yml b/.github/workflows/Lib edFi.ods.common pullrequest.yml index 7b24cc582c..8e9bdf2535 100644 --- a/.github/workflows/Lib edFi.ods.common pullrequest.yml +++ b/.github/workflows/Lib edFi.ods.common pullrequest.yml @@ -10,7 +10,7 @@ on: - tests/EdFi.TestFixture/**/* env: - INFORMATIONAL_VERSION: "6.1" + INFORMATIONAL_VERSION: "6.2" CONFIGURATION: "Release" jobs: From a4096d96eb32c4211e41c611d64cf29b7b357cb5 Mon Sep 17 00:00:00 2001 From: Axel Marquez Date: Thu, 14 Mar 2024 13:16:15 -0600 Subject: [PATCH 2/6] Update package references --- .../EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj | 2 +- Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj | 2 +- Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj | 2 +- .../EdFi.Ods.Repositories.NHibernate.Tests.csproj | 2 +- Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj | 2 +- Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj | 2 +- .../EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj | 2 +- .../EdFi.BulkLoadClient.Console.csproj | 2 +- .../EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj | 4 ++-- Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj | 2 +- .../EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj | 2 +- .../EdFi.XmlLookup.Console/EdFi.XmlLookup.Console.csproj | 2 +- .../EdFi.Admin.DataAccess.UnitTests.csproj | 2 +- .../EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj | 2 +- .../EdFi.Ods.WebApi.IntegrationTests.csproj | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj index d066e5586e..2c3283f4b2 100644 --- a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj +++ b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj @@ -16,7 +16,7 @@ true - + diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj index c9c767696f..df7639b7f1 100644 --- a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj +++ b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj @@ -22,7 +22,7 @@ - + diff --git a/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj b/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj index bba154e9a5..f35d80aa42 100644 --- a/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj +++ b/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj @@ -17,7 +17,7 @@ - + diff --git a/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj b/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj index a4a1272f97..b51e8156a2 100644 --- a/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj +++ b/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj @@ -17,7 +17,7 @@ true - + diff --git a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj index a85d13f257..024901356c 100644 --- a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj +++ b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj @@ -14,7 +14,7 @@ - + diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj index ad4a3b2db9..c59d370fc5 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj @@ -22,7 +22,7 @@ - + diff --git a/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj b/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj index 3568546e04..9e2be95b06 100644 --- a/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj +++ b/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj @@ -15,7 +15,7 @@ true - + diff --git a/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj b/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj index ead0bd6c7d..30a75c815e 100644 --- a/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj +++ b/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj @@ -38,7 +38,7 @@ - + diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj b/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj index a466b95dc3..2addf8a645 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj b/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj index 6bbc956963..54a3529242 100644 --- a/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj +++ b/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj @@ -23,7 +23,7 @@ - + diff --git a/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj b/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj index 6a2c706511..f18160414f 100644 --- a/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj +++ b/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj @@ -40,7 +40,7 @@ - + diff --git a/Utilities/DataLoading/EdFi.XmlLookup.Console/EdFi.XmlLookup.Console.csproj b/Utilities/DataLoading/EdFi.XmlLookup.Console/EdFi.XmlLookup.Console.csproj index e5979f454c..361411905d 100644 --- a/Utilities/DataLoading/EdFi.XmlLookup.Console/EdFi.XmlLookup.Console.csproj +++ b/Utilities/DataLoading/EdFi.XmlLookup.Console/EdFi.XmlLookup.Console.csproj @@ -29,7 +29,7 @@ - + diff --git a/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj b/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj index c8be8ef79c..78b304a52f 100644 --- a/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj +++ b/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj @@ -16,7 +16,7 @@ true - + diff --git a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj index ff0e0ed937..87c05de6bd 100644 --- a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj +++ b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj @@ -27,7 +27,7 @@ - + diff --git a/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj b/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj index 1c48ae3b41..b103a20fcc 100644 --- a/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj +++ b/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj @@ -17,7 +17,7 @@ - + From a39b6c9810b23b34ad3d038461fe6cab921d7535 Mon Sep 17 00:00:00 2001 From: Axel Marquez Date: Thu, 14 Mar 2024 14:11:26 -0600 Subject: [PATCH 3/6] Add `distinct_id` dispatch input for template workflows --- .github/workflows/Pkg EdFi.Ods.CodeGen.yml | 7 +++++++ .../workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml | 7 +++++++ .../Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml | 7 +++++++ .github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml | 7 +++++++ .github/workflows/Pkg EdFi.Ods.Minimal.Template.yml | 7 +++++++ .../Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml | 7 +++++++ .../Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml | 7 +++++++ .github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml | 7 +++++++ .github/workflows/Pkg EdFi.Ods.Populated.Template.yml | 7 +++++++ 9 files changed, 63 insertions(+) diff --git a/.github/workflows/Pkg EdFi.Ods.CodeGen.yml b/.github/workflows/Pkg EdFi.Ods.CodeGen.yml index 22c4c84913..5ed86348fb 100644 --- a/.github/workflows/Pkg EdFi.Ods.CodeGen.yml +++ b/.github/workflows/Pkg EdFi.Ods.CodeGen.yml @@ -11,6 +11,11 @@ on: - Utilities/CodeGeneration/**/* - Application/EdFi.Common/**/* workflow_dispatch: + inputs: + distinct_id: + description: 'distinct ID for Rebuild Database Templates workflow' + required: false + default: 'distinct_id' env: INFORMATIONAL_VERSION: "6.2" @@ -27,6 +32,8 @@ jobs: build: runs-on: ubuntu-latest steps: + - name: echo distinct ID ${{ github.event.inputs.distinct_id }} + run: echo "${{ github.event.inputs.distinct_id }}" - name: Checkout Ed-Fi-ODS uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml index f0e420f84d..fa62824ea3 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml @@ -10,6 +10,11 @@ on: branches: - main-6x workflow_dispatch: + inputs: + distinct_id: + description: 'distinct ID for Rebuild Database Templates workflow' + required: false + default: 'distinct_id' repository_dispatch: types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo] @@ -31,6 +36,8 @@ jobs: runs-on: windows-latest steps: + - name: echo distinct ID ${{ github.event.inputs.distinct_id }} + run: echo "${{ github.event.inputs.distinct_id }}" - name: Support longpaths run: git config --system core.longpaths true - name: Checkout Ed-Fi-ODS diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml index 1b4704c729..bf24d921a5 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml @@ -10,6 +10,11 @@ on: branches: - main-6x workflow_dispatch: + inputs: + distinct_id: + description: 'distinct ID for Rebuild Database Templates workflow' + required: false + default: 'distinct_id' repository_dispatch: types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo ,triggered-from-tpdmartifacts-repo] @@ -32,6 +37,8 @@ jobs: runs-on: windows-latest steps: + - name: echo distinct ID ${{ github.event.inputs.distinct_id }} + run: echo "${{ github.event.inputs.distinct_id }}" - name: Support longpaths run: git config --system core.longpaths true - name: Checkout Ed-Fi-ODS diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml index 91546270af..b3fdce453b 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml @@ -10,6 +10,11 @@ on: branches: - main-6x workflow_dispatch: + inputs: + distinct_id: + description: 'distinct ID for Rebuild Database Templates workflow' + required: false + default: 'distinct_id' repository_dispatch: types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo ,triggered-from-tpdmartifacts-repo] @@ -31,6 +36,8 @@ jobs: runs-on: windows-latest steps: + - name: echo distinct ID ${{ github.event.inputs.distinct_id }} + run: echo "${{ github.event.inputs.distinct_id }}" - name: Support longpaths run: git config --system core.longpaths true - name: Checkout Ed-Fi-ODS diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml index 81077476d4..5079dd7e6b 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml @@ -10,6 +10,11 @@ on: branches: - main-6x workflow_dispatch: + inputs: + distinct_id: + description: 'distinct ID for Rebuild Database Templates workflow' + required: false + default: 'distinct_id' repository_dispatch: types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo] @@ -31,6 +36,8 @@ jobs: runs-on: windows-latest steps: + - name: echo distinct ID ${{ github.event.inputs.distinct_id }} + run: echo "${{ github.event.inputs.distinct_id }}" - name: Support longpaths run: git config --system core.longpaths true - name: Checkout Ed-Fi-ODS diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml index 5d28e1b3da..474897e4e2 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml @@ -10,6 +10,11 @@ on: branches: - main-6x workflow_dispatch: + inputs: + distinct_id: + description: 'distinct ID for Rebuild Database Templates workflow' + required: false + default: 'distinct_id' repository_dispatch: types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo] @@ -31,6 +36,8 @@ jobs: runs-on: windows-latest steps: + - name: echo distinct ID ${{ github.event.inputs.distinct_id }} + run: echo "${{ github.event.inputs.distinct_id }}" - name: Support longpaths run: git config --system core.longpaths true - name: Checkout Ed-Fi-ODS diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml index 20912840e3..93b379b8d6 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml @@ -10,6 +10,11 @@ on: branches: - main-6x workflow_dispatch: + inputs: + distinct_id: + description: 'distinct ID for Rebuild Database Templates workflow' + required: false + default: 'distinct_id' repository_dispatch: types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo ,triggered-from-tpdmartifacts-repo] @@ -32,6 +37,8 @@ jobs: runs-on: windows-latest steps: + - name: echo distinct ID ${{ github.event.inputs.distinct_id }} + run: echo "${{ github.event.inputs.distinct_id }}" - name: Support longpaths run: git config --system core.longpaths true - name: Checkout Ed-Fi-ODS diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml index 5f7e8cc555..025dcbb1e6 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml @@ -10,6 +10,11 @@ on: branches: - main-6x workflow_dispatch: + inputs: + distinct_id: + description: 'distinct ID for Rebuild Database Templates workflow' + required: false + default: 'distinct_id' repository_dispatch: types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo ,triggered-from-tpdmartifacts-repo] @@ -31,6 +36,8 @@ jobs: runs-on: windows-latest steps: + - name: echo distinct ID ${{ github.event.inputs.distinct_id }} + run: echo "${{ github.event.inputs.distinct_id }}" - name: Support longpaths run: git config --system core.longpaths true - name: Checkout Ed-Fi-ODS diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml index 42a6d670cd..a728f74bba 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml @@ -10,6 +10,11 @@ on: branches: - main-6x workflow_dispatch: + inputs: + distinct_id: + description: 'distinct ID for Rebuild Database Templates workflow' + required: false + default: 'distinct_id' repository_dispatch: types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo] @@ -30,6 +35,8 @@ jobs: runs-on: windows-latest steps: + - name: echo distinct ID ${{ github.event.inputs.distinct_id }} + run: echo "${{ github.event.inputs.distinct_id }}" - name: Support longpaths run: git config --system core.longpaths true - name: Checkout Ed-Fi-ODS From bb2cfa6d9beeb3032d7fe66e84980ac70992e653 Mon Sep 17 00:00:00 2001 From: Axel Marquez Date: Thu, 14 Mar 2024 15:16:26 -0600 Subject: [PATCH 4/6] Downgrade `upload-artifact` since it causes issues with the `Rebuild Database Templates` --- .github/workflows/Pkg EdFi.Ods.CodeGen.yml | 2 +- .github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml | 2 +- .../workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml | 2 +- .github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml | 2 +- .github/workflows/Pkg EdFi.Ods.Minimal.Template.yml | 2 +- .../workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml | 2 +- .../Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml | 2 +- .github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml | 2 +- .github/workflows/Pkg EdFi.Ods.Populated.Template.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/Pkg EdFi.Ods.CodeGen.yml b/.github/workflows/Pkg EdFi.Ods.CodeGen.yml index 5ed86348fb..25f9f44afe 100644 --- a/.github/workflows/Pkg EdFi.Ods.CodeGen.yml +++ b/.github/workflows/Pkg EdFi.Ods.CodeGen.yml @@ -88,7 +88,7 @@ jobs: - name: Upload EdFi.Ods.CodeGen NugetPackage if: success() - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 + uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 with: name: NugetPackage.Artifacts path: ${{ github.workspace }}/Ed-Fi-ODS/NugetPackages/*.nupkg diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml index fa62824ea3..f2a3d7afd8 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml @@ -111,7 +111,7 @@ jobs: shell: powershell - name: Upload EdFi.Ods.Minimal.Template Artifacts if: success() || failure() - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 + uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 with: name: NugetPackages.Artifacts path: ${{ github.workspace }}/Ed-Fi-ODS/NugetPackages/EdFi.Suite3.Ods.Minimal.Template.PostgreSQL*.nupkg diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml index bf24d921a5..806c6645af 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml @@ -119,7 +119,7 @@ jobs: shell: powershell - name: Upload EdFi.Ods.Minimal.Template.TPDM.PostgreSQL Artifacts if: success() || failure() - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 + uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 with: name: NugetPackages.Artifacts path: | diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml index b3fdce453b..4acce4efcf 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml @@ -112,7 +112,7 @@ jobs: shell: powershell - name: Upload EdFi.Ods.Minimal.Template.TPDM.Core Artifacts if: success() || failure() - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 + uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 with: name: EdFi.Ods.Minimal.Template.TPDM.Core.Artifacts path: | diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml index 5079dd7e6b..7ea5b4a83e 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml @@ -109,7 +109,7 @@ jobs: shell: powershell - name: Upload EdFi.Ods.Minimal.Template Artifacts if: success() || failure() - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 + uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 with: name: NugetPackages.Artifacts path: ${{ github.workspace }}/Ed-Fi-ODS-Implementation/NugetPackages/*.* diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml index 474897e4e2..3a3895dc56 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml @@ -111,7 +111,7 @@ jobs: shell: powershell - name: Upload EdFi.Ods.Populated.Template Artifacts if: success() || failure() - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 + uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 with: name: NugetPackages.Artifacts path: ${{ github.workspace }}/Ed-Fi-ODS/NugetPackages/EdFi.Suite3.Ods.Populated.Template.PostgreSQL*.nupkg diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml index 93b379b8d6..2aae1c6141 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml @@ -116,7 +116,7 @@ jobs: shell: powershell - name: Upload EdFi.Ods.Populated.Template.TPDM.PostgreSQL Artifacts if: success() || failure() - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 + uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 with: name: NugetPackages.Artifacts path: | diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml index 025dcbb1e6..c3a36d99ac 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml @@ -112,7 +112,7 @@ jobs: shell: powershell - name: Upload EdFi.Ods.Populated.Template.TPDM.Core Artifacts if: success() || failure() - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 + uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 with: name: EdFi.Ods.Populated.Template.TPDM.Core.Artifacts path: | diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml index a728f74bba..c21452b309 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml @@ -110,7 +110,7 @@ jobs: shell: powershell - name: Upload EdFi.Ods.Populated.Template Artifacts if: success() || failure() - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 + uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 with: name: NugetPackages.Artifacts path: ${{ github.workspace }}/Ed-Fi-ODS-Implementation/NugetPackages/*.* From f50a4f05d41ed767cb9b180b1bcd5eb01ac1ac56 Mon Sep 17 00:00:00 2001 From: Axel Marquez Date: Thu, 14 Mar 2024 16:52:37 -0600 Subject: [PATCH 5/6] Fix upload path so that `Rebuild Database Templates` can download them --- .../workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml | 2 +- .github/workflows/Pkg EdFi.Ods.Minimal.Template.yml | 2 +- .../Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml | 2 +- .github/workflows/Pkg EdFi.Ods.Populated.Template.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml index 806c6645af..c491ea6fef 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml @@ -123,6 +123,6 @@ jobs: with: name: NugetPackages.Artifacts path: | - ${{ github.workspace }}/Ed-Fi-ODS/NugetPackages/EdFi.Suite3.Ods.Minimal.Template.TPDM.Core.PostgreSQL*.nupkg + ${{ github.workspace }}/Ed-Fi-ODS/NugetPackages/EdFi.Suite3.Ods.Minimal.Template.TPDM.Core.*.PostgreSQL*.nupkg ${{ github.workspace }}/Ed-Fi-ODS/Utilities/DataLoading/EdFi.BulkLoadClient.Console/bin/**/logfile*.* ${{ github.workspace }}/Ed-Fi-ODS-Implementation/Application/EdFi.Ods.Api.IntegrationTestHarness/bin/**/TestHarnessLog*.* diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml index 7ea5b4a83e..8edc88d441 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml @@ -112,4 +112,4 @@ jobs: uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 with: name: NugetPackages.Artifacts - path: ${{ github.workspace }}/Ed-Fi-ODS-Implementation/NugetPackages/*.* + path: ${{ github.workspace }}/Ed-Fi-ODS/NugetPackages/EdFi.Suite3.Ods.Minimal.Template.*.nupkg diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml index 2aae1c6141..25f3b933fc 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml @@ -120,6 +120,6 @@ jobs: with: name: NugetPackages.Artifacts path: | - ${{ github.workspace }}/Ed-Fi-ODS/NugetPackages/EdFi.Suite3.Ods.Populated.Template.TPDM.Core.PostgreSQL*.nupkg + ${{ github.workspace }}/Ed-Fi-ODS/NugetPackages/EdFi.Suite3.Ods.Populated.Template.TPDM.Core.*.PostgreSQL*.nupkg ${{ github.workspace }}/Ed-Fi-ODS/Utilities/DataLoading/EdFi.BulkLoadClient.Console/bin/**/logfile*.* ${{ github.workspace }}/Ed-Fi-ODS-Implementation/Application/EdFi.Ods.Api.IntegrationTestHarness/bin/**/TestHarnessLog*.* diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml index c21452b309..8cacf54da7 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml @@ -113,4 +113,4 @@ jobs: uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 with: name: NugetPackages.Artifacts - path: ${{ github.workspace }}/Ed-Fi-ODS-Implementation/NugetPackages/*.* + path: ${{ github.workspace }}/Ed-Fi-ODS/NugetPackages/EdFi.Suite3.Ods.Populated.Template.*.nupkg \ No newline at end of file From c440cfe3a9e377c9881cc364fafb7453d6750881 Mon Sep 17 00:00:00 2001 From: Axel Marquez Date: Thu, 14 Mar 2024 19:34:53 -0600 Subject: [PATCH 6/6] Increase build incrementer --- .github/workflows/Pkg EdFi.Ods.Minimal.Template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml index 8edc88d441..420b602524 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml @@ -21,7 +21,7 @@ on: env: EDFI_STANDARD_REFERENCE: "v4.0.0" INFORMATIONAL_VERSION: "6.2" - BUILD_INCREMENTER: "1" + BUILD_INCREMENTER: "54" AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json" AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }} VSS_NUGET_EXTERNAL_FEED_ENDPOINTS : '{"endpointCredentials": [{"endpoint": "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json","password": "${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}"}]}'