Merge pull request #368 from SlateFoundation/develop

Release: v2.21.5
SlateFoundation · Sep 22, 2023 · 51eafe1 · 51eafe1
2 parents 977830f + 996aafe
commit 51eafe1
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 99 deletions.
diff --git a/.github/workflows/release-prepare.yml b/.github/workflows/release-prepare.yml
@@ -16,5 +16,5 @@ jobs:
 
     - uses: JarvusInnovations/infra-components@channels/github-actions/release-prepare/latest
       with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
+        github-token: ${{ secrets.BOT_GITHUB_TOKEN }}
         release-branch: releases/v2
diff --git a/.holo/branches/docs-site/_slate.toml b/.holo/branches/docs-site/_slate.toml
@@ -1,5 +1,5 @@
 [holomapping]
+root = "docs"
 files = [
-    "docs/**",
     "mkdocs.*.yml"
 ]
diff --git a/.holo/branches/docs-site/docs/_slate.toml b/.holo/branches/docs-site/docs/_slate.toml
@@ -0,0 +1,6 @@
+[holomapping]
+root = "docs"
+files = [
+    "**",
+    "!mkdocs.*.yml",
+]
diff --git a/.holo/sources/skeleton-v2.toml b/.holo/sources/skeleton-v2.toml
@@ -1,3 +1,3 @@
 [holosource]
 url = "https://github.com/JarvusInnovations/emergence-skeleton-v2"
-ref = "refs/tags/v2.12.5"
+ref = "refs/tags/v2.12.7"
diff --git a/Dockerfile b/Dockerfile
diff --git a/mkdocs.repo.yml → docs/mkdocs.repo.yml b/mkdocs.repo.yml → docs/mkdocs.repo.yml
diff --git a/mkdocs.site.yml → docs/mkdocs.site.yml b/mkdocs.site.yml → docs/mkdocs.site.yml
diff --git a/mkdocs.studio.yml → docs/mkdocs.studio.yml b/mkdocs.studio.yml → docs/mkdocs.studio.yml
diff --git a/mkdocs.users.yml → docs/mkdocs.users.yml b/mkdocs.users.yml → docs/mkdocs.users.yml
diff --git a/habitat/composite/default.toml b/habitat/composite/default.toml
diff --git a/habitat/composite/plan.sh b/habitat/composite/plan.sh
diff --git a/habitat/default.toml b/habitat/default.toml
diff --git a/habitat/plan.sh b/habitat/plan.sh
diff --git a/php-classes/Slate/Connectors/AbstractSpreadsheetConnector.php b/php-classes/Slate/Connectors/AbstractSpreadsheetConnector.php
@@ -278,6 +278,14 @@ public static function pullStudents(IJob $Job, SpreadsheetReader $spreadsheet, $
 
             // apply values from spreadsheet
             try {
+                if (!$Record->isA(User::class)) {
+                    throw new RemoteRecordInvalid(
+                        'not-a-user',
+                        sprintf('Matched student to record %s from row #%u, but record class is not user or student...refusing to promote automatically', $Record->getTitle(), $results['analyzed']),
+                        $row
+                    );
+                }
+
                 static::_applyStudentUserChanges($Job, $Record, $row, $results);
             } catch (RemoteRecordInvalid $e) {
                 if ($e->getValueKey()) {