Fixes back

realm · Aug 21, 2023 · 319f5e8 · 319f5e8
1 parent a57085b
commit 319f5e8
Show file tree

Hide file tree

Showing 11 changed files with 91 additions and 45 deletions.
diff --git a/.github/templates/pr.yml b/.github/templates/pr.yml
@@ -31,7 +31,7 @@ jobs:
   build-wrappers:
     uses: ./.github/workflows/wrappers.yml
     name: Wrappers
-  _: #@ template.replace(deployBaas([".NET Framework", "Code Coverage", "UWP Managed", "Xamarin.macOS", "iOS", "Android", "MacCatalyst"]))
+  _: #@ template.replace(deployBaas(["Code Coverage"]))
   build-packages:
     uses: ./.github/workflows/build-packages.yml
     name: Package
@@ -42,12 +42,12 @@ jobs:
   _: #@ template.replace(buildUnity())
   _: #@ template.replace(testUnity('["Mono-Net4"]', '[{ "os": "windows", "testPlatform": "Windows64" }, { "os": "linux", "testPlatform": "Linux64" }]'))
   _: #@ template.replace(runTests(".NET Framework", runSyncTests = False))
-  _: #@ template.replace(runTests("UWP Managed", runSyncTests = True, additionalSecrets = ["Pfx_Password", "Base64_Encoded_Pfx"]))
+  _: #@ template.replace(runTests("UWP Managed", runSyncTests = False, additionalSecrets = ["Pfx_Password", "Base64_Encoded_Pfx"]))
   _: #@ template.replace(runNetCoreTests('["net7.0"]'))
-  _: #@ template.replace(runTests("macOS", runSyncTests = True))
-  _: #@ template.replace(runTests("iOS", runSyncTests = True))
-  _: #@ template.replace(runTests("tvOS", runSyncTests = True))
-  _: #@ template.replace(runTests("Android", runSyncTests = True, additionalSecrets=["AWS_DEVICEFARM_ACCESS_KEY_ID", "AWS_DEVICEFARM_SECRET_ACCESS_KEY", "DEVICEFARM_PROJECT_ARN", "DEVICEFARM_ANDROID_POOL_ARN"]))
+  _: #@ template.replace(runTests("macOS", runSyncTests = False))
+  _: #@ template.replace(runTests("iOS", runSyncTests = False))
+  _: #@ template.replace(runTests("tvOS", runSyncTests = False))
+  _: #@ template.replace(runTests("Android", runSyncTests = False, additionalSecrets=["AWS_DEVICEFARM_ACCESS_KEY_ID", "AWS_DEVICEFARM_SECRET_ACCESS_KEY", "DEVICEFARM_PROJECT_ARN", "DEVICEFARM_ANDROID_POOL_ARN"]))
   _: #@ template.replace(runWovenClassesTests())
   _: #@ template.replace(runSourceGenerationTests())
   test-weaver:

diff --git a/.github/templates/test.lib.yml b/.github/templates/test.lib.yml
@@ -92,4 +92,13 @@ env:
 #@ else:
 - #@ template.replace(fetchPackageArtifacts())
 #@ end
+- uses: realm/ci-actions/mdb-realm/deploy@fa20eb972b9f018654fdb4e2c7afb52b0532f907
+  if: ${{ inputs.realmUrl }}
+  with:
+    projectId: ${{ secrets.AtlasProjectId}}
+    realmUrl: ${{ inputs.realmUrl }}
+    atlasUrl: ${{ inputs.atlasUrl}}
+    apiKey: ${{ secrets.AtlasPublicKey}}
+    privateApiKey: ${{ secrets.AtlasPrivateKey }}
+    clusterSize: M10
 #@ end
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -28,7 +28,7 @@ jobs:
   deploy-cluster:
     uses: ./.github/workflows/deploy-baas.yml
     with:
-      differentiators: '["net-framework", "code-coverage", "uwp-managed", "xamarinmacos", "ios", "android", "maccatalyst"]'
+      differentiators: '["code-coverage"]'
       BaseUrl: https://realm-qa.mongodb.com
       AtlasBaseUrl: https://cloud-qa.mongodb.com
     secrets:
@@ -76,16 +76,9 @@ jobs:
     if: always() && !cancelled() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled')
     needs:
     - build-packages
-    - deploy-cluster
     with:
       version: ${{ needs.build-packages.outputs.package_version }}
-      clusterName: ${{ needs.deploy-cluster.outputs.clusterName }}
-      realmUrl: https://realm-qa.mongodb.com
-      atlasUrl: https://cloud-qa.mongodb.com
     secrets:
-      AtlasProjectId: ${{ secrets.ATLAS_QA_PROJECT_ID }}
-      AtlasPublicKey: ${{ secrets.ATLAS_QA_PUBLIC_API_KEY }}
-      AtlasPrivateKey: ${{ secrets.ATLAS_QA_PRIVATE_API_KEY }}
       Pfx_Password: ${{ secrets.Pfx_Password }}
       Base64_Encoded_Pfx: ${{ secrets.Base64_Encoded_Pfx }}
   test-net-core:
@@ -103,64 +96,36 @@ jobs:
     if: always() && !cancelled() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled')
     needs:
     - build-packages
-    - deploy-cluster
     with:
       version: ${{ needs.build-packages.outputs.package_version }}
-      clusterName: ${{ needs.deploy-cluster.outputs.clusterName }}
-      realmUrl: https://realm-qa.mongodb.com
-      atlasUrl: https://cloud-qa.mongodb.com
-    secrets:
-      AtlasProjectId: ${{ secrets.ATLAS_QA_PROJECT_ID }}
-      AtlasPublicKey: ${{ secrets.ATLAS_QA_PUBLIC_API_KEY }}
-      AtlasPrivateKey: ${{ secrets.ATLAS_QA_PRIVATE_API_KEY }}
+    secrets: {}
   test-ios:
     uses: ./.github/workflows/test-ios.yml
     name: Test
     if: always() && !cancelled() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled')
     needs:
     - build-packages
-    - deploy-cluster
     with:
       version: ${{ needs.build-packages.outputs.package_version }}
-      clusterName: ${{ needs.deploy-cluster.outputs.clusterName }}
-      realmUrl: https://realm-qa.mongodb.com
-      atlasUrl: https://cloud-qa.mongodb.com
-    secrets:
-      AtlasProjectId: ${{ secrets.ATLAS_QA_PROJECT_ID }}
-      AtlasPublicKey: ${{ secrets.ATLAS_QA_PUBLIC_API_KEY }}
-      AtlasPrivateKey: ${{ secrets.ATLAS_QA_PRIVATE_API_KEY }}
+    secrets: {}
   test-tvos:
     uses: ./.github/workflows/test-tvos.yml
     name: Test
     if: always() && !cancelled() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled')
     needs:
     - build-packages
-    - deploy-cluster
     with:
       version: ${{ needs.build-packages.outputs.package_version }}
-      clusterName: ${{ needs.deploy-cluster.outputs.clusterName }}
-      realmUrl: https://realm-qa.mongodb.com
-      atlasUrl: https://cloud-qa.mongodb.com
-    secrets:
-      AtlasProjectId: ${{ secrets.ATLAS_QA_PROJECT_ID }}
-      AtlasPublicKey: ${{ secrets.ATLAS_QA_PUBLIC_API_KEY }}
-      AtlasPrivateKey: ${{ secrets.ATLAS_QA_PRIVATE_API_KEY }}
+    secrets: {}
   test-android:
     uses: ./.github/workflows/test-android.yml
     name: Test
     if: always() && !cancelled() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled')
     needs:
     - build-packages
-    - deploy-cluster
     with:
       version: ${{ needs.build-packages.outputs.package_version }}
-      clusterName: ${{ needs.deploy-cluster.outputs.clusterName }}
-      realmUrl: https://realm-qa.mongodb.com
-      atlasUrl: https://cloud-qa.mongodb.com
     secrets:
-      AtlasProjectId: ${{ secrets.ATLAS_QA_PROJECT_ID }}
-      AtlasPublicKey: ${{ secrets.ATLAS_QA_PUBLIC_API_KEY }}
-      AtlasPrivateKey: ${{ secrets.ATLAS_QA_PRIVATE_API_KEY }}
       AWS_DEVICEFARM_ACCESS_KEY_ID: ${{ secrets.AWS_DEVICEFARM_ACCESS_KEY_ID }}
       AWS_DEVICEFARM_SECRET_ACCESS_KEY: ${{ secrets.AWS_DEVICEFARM_SECRET_ACCESS_KEY }}
       DEVICEFARM_PROJECT_ARN: ${{ secrets.DEVICEFARM_PROJECT_ARN }}

diff --git a/.github/workflows/test-android.yml b/.github/workflows/test-android.yml
@@ -57,6 +57,15 @@ jobs:
       with:
         name: Realm.${{ inputs.version }}
         path: ${{ github.workspace }}/Realm/packages/
+    - uses: realm/ci-actions/mdb-realm/deploy@fa20eb972b9f018654fdb4e2c7afb52b0532f907
+      if: ${{ inputs.realmUrl }}
+      with:
+        projectId: ${{ secrets.AtlasProjectId}}
+        realmUrl: ${{ inputs.realmUrl }}
+        atlasUrl: ${{ inputs.atlasUrl}}
+        apiKey: ${{ secrets.AtlasPublicKey}}
+        privateApiKey: ${{ secrets.AtlasPrivateKey }}
+        clusterSize: M10
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@0b44c6745b7e81956596964100aadb92d667c497
       if: ${{ runner.os == 'Windows' }}

diff --git a/.github/workflows/test-code-coverage.yml b/.github/workflows/test-code-coverage.yml
@@ -139,6 +139,15 @@ jobs:
       with:
         name: wrappers-windows-uwp-ARM64
         path: wrappers/build
+    - uses: realm/ci-actions/mdb-realm/deploy@fa20eb972b9f018654fdb4e2c7afb52b0532f907
+      if: ${{ inputs.realmUrl }}
+      with:
+        projectId: ${{ secrets.AtlasProjectId}}
+        realmUrl: ${{ inputs.realmUrl }}
+        atlasUrl: ${{ inputs.atlasUrl}}
+        apiKey: ${{ secrets.AtlasPublicKey}}
+        privateApiKey: ${{ secrets.AtlasPrivateKey }}
+        clusterSize: M10
     - name: Setup Coverlet & Report Generator
       run: |
         dotnet tool install coverlet.console --tool-path tools

diff --git a/.github/workflows/test-ios.yml b/.github/workflows/test-ios.yml
@@ -49,6 +49,15 @@ jobs:
       with:
         name: Realm.${{ inputs.version }}
         path: ${{ github.workspace }}/Realm/packages/
+    - uses: realm/ci-actions/mdb-realm/deploy@fa20eb972b9f018654fdb4e2c7afb52b0532f907
+      if: ${{ inputs.realmUrl }}
+      with:
+        projectId: ${{ secrets.AtlasProjectId}}
+        realmUrl: ${{ inputs.realmUrl }}
+        atlasUrl: ${{ inputs.atlasUrl}}
+        apiKey: ${{ secrets.AtlasPublicKey}}
+        privateApiKey: ${{ secrets.AtlasPrivateKey }}
+        clusterSize: M10
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@0b44c6745b7e81956596964100aadb92d667c497
       if: ${{ runner.os == 'Windows' }}

diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
@@ -49,6 +49,15 @@ jobs:
       with:
         name: Realm.${{ inputs.version }}
         path: ${{ github.workspace }}/Realm/packages/
+    - uses: realm/ci-actions/mdb-realm/deploy@fa20eb972b9f018654fdb4e2c7afb52b0532f907
+      if: ${{ inputs.realmUrl }}
+      with:
+        projectId: ${{ secrets.AtlasProjectId}}
+        realmUrl: ${{ inputs.realmUrl }}
+        atlasUrl: ${{ inputs.atlasUrl}}
+        apiKey: ${{ secrets.AtlasPublicKey}}
+        privateApiKey: ${{ secrets.AtlasPrivateKey }}
+        clusterSize: M10
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@0b44c6745b7e81956596964100aadb92d667c497
       if: ${{ runner.os == 'Windows' }}

diff --git a/.github/workflows/test-net-core.yml b/.github/workflows/test-net-core.yml
@@ -74,6 +74,15 @@ jobs:
       with:
         name: Realm.${{ inputs.version }}
         path: ${{ github.workspace }}/Realm/packages/
+    - uses: realm/ci-actions/mdb-realm/deploy@fa20eb972b9f018654fdb4e2c7afb52b0532f907
+      if: ${{ inputs.realmUrl }}
+      with:
+        projectId: ${{ secrets.AtlasProjectId}}
+        realmUrl: ${{ inputs.realmUrl }}
+        atlasUrl: ${{ inputs.atlasUrl}}
+        apiKey: ${{ secrets.AtlasPublicKey}}
+        privateApiKey: ${{ secrets.AtlasPrivateKey }}
+        clusterSize: M10
     - name: Publish Tests/Realm.Tests
       run: dotnet publish Tests/Realm.Tests -c Release -f ${{ matrix.framework }} -r ${{ matrix.os.runtime }} -p:RestoreConfigFile=Tests/Test.NuGet.Config -p:UseRealmNupkgsWithVersion=${{ inputs.version }} -p:RealmTestsStandaloneExe=true --no-self-contained
     - name: Output executable path

diff --git a/.github/workflows/test-net-framework.yml b/.github/workflows/test-net-framework.yml
@@ -49,6 +49,15 @@ jobs:
       with:
         name: Realm.${{ inputs.version }}
         path: ${{ github.workspace }}/Realm/packages/
+    - uses: realm/ci-actions/mdb-realm/deploy@fa20eb972b9f018654fdb4e2c7afb52b0532f907
+      if: ${{ inputs.realmUrl }}
+      with:
+        projectId: ${{ secrets.AtlasProjectId}}
+        realmUrl: ${{ inputs.realmUrl }}
+        atlasUrl: ${{ inputs.atlasUrl}}
+        apiKey: ${{ secrets.AtlasPublicKey}}
+        privateApiKey: ${{ secrets.AtlasPrivateKey }}
+        clusterSize: M10
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@0b44c6745b7e81956596964100aadb92d667c497
       if: ${{ runner.os == 'Windows' }}

diff --git a/.github/workflows/test-tvos.yml b/.github/workflows/test-tvos.yml
@@ -49,6 +49,15 @@ jobs:
       with:
         name: Realm.${{ inputs.version }}
         path: ${{ github.workspace }}/Realm/packages/
+    - uses: realm/ci-actions/mdb-realm/deploy@fa20eb972b9f018654fdb4e2c7afb52b0532f907
+      if: ${{ inputs.realmUrl }}
+      with:
+        projectId: ${{ secrets.AtlasProjectId}}
+        realmUrl: ${{ inputs.realmUrl }}
+        atlasUrl: ${{ inputs.atlasUrl}}
+        apiKey: ${{ secrets.AtlasPublicKey}}
+        privateApiKey: ${{ secrets.AtlasPrivateKey }}
+        clusterSize: M10
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@0b44c6745b7e81956596964100aadb92d667c497
       if: ${{ runner.os == 'Windows' }}

diff --git a/.github/workflows/test-uwp-managed.yml b/.github/workflows/test-uwp-managed.yml
@@ -53,6 +53,15 @@ jobs:
       with:
         name: Realm.${{ inputs.version }}
         path: ${{ github.workspace }}/Realm/packages/
+    - uses: realm/ci-actions/mdb-realm/deploy@fa20eb972b9f018654fdb4e2c7afb52b0532f907
+      if: ${{ inputs.realmUrl }}
+      with:
+        projectId: ${{ secrets.AtlasProjectId}}
+        realmUrl: ${{ inputs.realmUrl }}
+        atlasUrl: ${{ inputs.atlasUrl}}
+        apiKey: ${{ secrets.AtlasPublicKey}}
+        privateApiKey: ${{ secrets.AtlasPrivateKey }}
+        clusterSize: M10
     - name: Import test certificate
       run: |
         $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}")