Merge migrations

spack · Aug 8, 2024 · d045a38 · d045a38
1 parent e27ba2f
commit d045a38
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 39 deletions.
diff --git a/analytics/analytics/core/migrations/0020_remove_jobdatadimension_is_build_and_more.py b/analytics/analytics/core/migrations/0020_remove_jobdatadimension_is_build_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.13 on 2024-07-18 16:48
+# Generated by Django 4.2.13 on 2024-08-08 16:23
 
 from django.db import migrations, models
 
@@ -9,28 +9,32 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.RemoveField(
+            model_name="jobdatadimension",
+            name="is_build",
+        ),
         migrations.AddField(
             model_name="jobdatadimension",
             name="gitlab_section_timers",
             field=models.JSONField(
                 db_comment="The GitLab CI section timers for this job.", default=dict
             ),
         ),
-        migrations.RemoveField(
-            model_name="jobdatadimension",
-            name="is_build",
-        ),
         migrations.AddField(
             model_name="jobdatadimension",
             name="job_type",
             field=models.CharField(
                 choices=[
-                    ("Build", "Build"),
-                    ("Generate", "Generate"),
-                    ("No Specs to Rebuild", "No Specs"),
-                    ("Rebuild Index", "Rebuild Index"),
+                    ("build", "Build"),
+                    ("generate", "Generate"),
+                    ("no-specs-to-rebuild", "No Specs to Rebuild"),
+                    ("rebuild-index", "Rebuild Index"),
+                    ("copy", "Copy"),
+                    ("unsupported-copy", "Unsupported Copy"),
+                    ("sign-pkgs", "Sign Packages"),
+                    ("protected-publish", "Protected Publish"),
                 ],
-                default="Build",
+                default="build",
                 max_length=19,
             ),
             preserve_default=False,

diff --git a/analytics/analytics/core/migrations/0021_alter_jobdatadimension_job_type.py b/analytics/analytics/core/migrations/0021_alter_jobdatadimension_job_type.py