Merge branch 'main-6x' into ODS-6263

Ed-Fi-Alliance-OSS · Feb 23, 2024 · 9255ef9 · 9255ef9
2 parents ce76549 + 751c247
commit 9255ef9
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml
@@ -14,7 +14,7 @@ on:
     types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo]
 
 env:
-  EDFI_STANDARD_REFERENCE: "main"
+  EDFI_STANDARD_REFERENCE: "v4.0.0"
   INFORMATIONAL_VERSION: "6.2"
   BUILD_INCREMENTER: "1"
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"

diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml
@@ -14,7 +14,8 @@ on:
     types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo ,triggered-from-tpdmartifacts-repo]
 
 env:
-  EDFI_STANDARD_REFERENCE: "main"
+  EDFI_STANDARD_REFERENCE: "v4.0.0"
+  TPDM_ARTIFACT_REFERENCE: "Data-Standard-v4.0.0"
   INFORMATIONAL_VERSION: "6.2"
   BUILD_INCREMENTER: "1"
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"
@@ -59,6 +60,7 @@ jobs:
       with:
           repository: Ed-Fi-Alliance-OSS/Ed-Fi-TPDM-Artifacts
           path: Ed-Fi-TPDM-Artifacts/
+          ref: ${{ env.TPDM_ARTIFACT_REFERENCE }}
     - name: Is pull request branch exists in Ed-Fi-TPDM-Artifacts
       working-directory: ./Ed-Fi-ODS/
       shell: powershell

diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml
@@ -12,8 +12,10 @@ on:
   workflow_dispatch:
   repository_dispatch:
     types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo ,triggered-from-tpdmartifacts-repo]
+
 env:
-  EDFI_STANDARD_REFERENCE: "main"
+  EDFI_STANDARD_REFERENCE: "v4.0.0"
+  TPDM_ARTIFACT_REFERENCE: "Data-Standard-v4.0.0"
   INFORMATIONAL_VERSION: "6.2"
   BUILD_INCREMENTER: "1"
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"
@@ -57,6 +59,7 @@ jobs:
       with:
           repository: Ed-Fi-Alliance-OSS/Ed-Fi-TPDM-Artifacts
           path: Ed-Fi-TPDM-Artifacts/
+          ref: ${{ env.TPDM_ARTIFACT_REFERENCE }}
     - name: Is pull request branch exists in Ed-Fi-TPDM-Artifacts
       working-directory: ./Ed-Fi-ODS/
       shell: powershell

diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml
@@ -14,7 +14,7 @@ on:
     types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo]
 
 env:
-  EDFI_STANDARD_REFERENCE: "main"
+  EDFI_STANDARD_REFERENCE: "v4.0.0"
   INFORMATIONAL_VERSION: "6.2"
   BUILD_INCREMENTER: "1"
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"

diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml
@@ -14,7 +14,7 @@ on:
     types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo]
 
 env:
-  EDFI_STANDARD_REFERENCE: "main"
+  EDFI_STANDARD_REFERENCE: "v4.0.0"
   INFORMATIONAL_VERSION: "6.2"
   BUILD_INCREMENTER: "1"
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"

diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml
@@ -12,8 +12,10 @@ on:
   workflow_dispatch:
   repository_dispatch:
     types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo ,triggered-from-tpdmartifacts-repo]
+
 env:
-  EDFI_STANDARD_REFERENCE: "main"
+  EDFI_STANDARD_REFERENCE: "v4.0.0"
+  TPDM_ARTIFACT_REFERENCE: "Data-Standard-v4.0.0"
   INFORMATIONAL_VERSION: "6.2"
   BUILD_INCREMENTER: "1"
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"
@@ -58,6 +60,7 @@ jobs:
       with:
           repository: Ed-Fi-Alliance-OSS/Ed-Fi-TPDM-Artifacts
           path: Ed-Fi-TPDM-Artifacts/
+          ref: ${{ env.TPDM_ARTIFACT_REFERENCE }}
     - name: Is pull request branch exists in Ed-Fi-TPDM-Artifacts
       working-directory: ./Ed-Fi-ODS/
       shell: powershell

diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml
@@ -14,7 +14,8 @@ on:
     types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo ,triggered-from-tpdmartifacts-repo]
 
 env:
-  EDFI_STANDARD_REFERENCE: "main"
+  EDFI_STANDARD_REFERENCE: "v4.0.0"
+  TPDM_ARTIFACT_REFERENCE: "Data-Standard-v4.0.0"
   INFORMATIONAL_VERSION: "6.2"
   BUILD_INCREMENTER: "1"
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"
@@ -58,6 +59,7 @@ jobs:
       with:
           repository: Ed-Fi-Alliance-OSS/Ed-Fi-TPDM-Artifacts
           path: Ed-Fi-TPDM-Artifacts/
+          ref: ${{ env.TPDM_ARTIFACT_REFERENCE }}
     - name: Is pull request branch exists in Ed-Fi-TPDM-Artifacts
       working-directory: ./Ed-Fi-ODS/
       shell: powershell

diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml
@@ -12,8 +12,9 @@ on:
   workflow_dispatch:
   repository_dispatch:
     types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo]
+
 env:
-  EDFI_STANDARD_REFERENCE: "main"
+  EDFI_STANDARD_REFERENCE: "v4.0.0"
   INFORMATIONAL_VERSION: "6.2"
   BUILD_INCREMENTER: "1"
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"