fix: post merge release tagging

juspay · Apr 23, 2024 · 3b7e262 · 3b7e262
1 parent 15840e7
commit 3b7e262
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/ci_merge_main.yaml b/.github/workflows/ci_merge_main.yaml
@@ -20,6 +20,7 @@ jobs:
               uses: actions/checkout@v4
               with:
                   fetch-depth: 0
+                  token: ${{ secrets.SUPERPOSITION_TOKEN }}
 
             - name: Install Rust
               uses: dtolnay/rust-toolchain@master
@@ -28,18 +29,24 @@ jobs:
                   targets: wasm32-unknown-unknown
                   components: rustfmt, clippy
 
-            - name: Semver release
-              uses: cocogitto/cocogitto-action@v3
-              id: release
+            - name: install cargo-edit to perform set-version
+              uses: baptiste0928/[email protected]
               with:
-                  release: true
-                  git-user: "Superposition Bot"
-                  git-user-email: "[email protected]"
-                  check-latest-tag-only: true
+                  crate: cargo-edit
 
-            - name: Push code to main
+            - name: install cocogitto
+              uses: baptiste0928/[email protected]
+              with:
+                  crate: cocogitto
+
+            - name: Semver release
               shell: bash
               run: |
                 git config user.email "[email protected]"
                 git config user.name "Superposition Bot"
-                git push --follow-tags origin main
+                cog bump --auto --skip-ci-override "[skip ci]"
+
+            - name: Push code to main
+              shell: bash
+              run: |
+                git push --follow-tags
diff --git a/crates/experimentation_platform/src/db/models.rs b/crates/experimentation_platform/src/db/models.rs
@@ -1,12 +1,12 @@
 use crate::db::schema::*;
 use chrono::{DateTime, NaiveDateTime, Utc};
 
-use diesel::{Insertable, Queryable, QueryableByName, Selectable};
+use diesel::{query_builder::QueryId, Insertable, Queryable, QueryableByName, Selectable};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
 #[derive(
-    Debug, Clone, Copy, PartialEq, Deserialize, Serialize, diesel_derive_enum::DbEnum,
+    Debug, Clone, Copy, PartialEq, Deserialize, Serialize, diesel_derive_enum::DbEnum, QueryId,
 )]
 #[DbValueStyle = "UPPERCASE"]
 #[ExistingTypePath = "crate::db::schema::sql_types::ExperimentStatusType"]