chore(ci): differences from blockifier repo (#1)

Signed-off-by: Dori Medini <[email protected]>

.github/workflows/ci.yml

@@ -4,9 +4,9 @@ on:
   push:
     branches:
       - main
-      - main-v[0-9].**
+      - main-v[0-9]+.**
     tags:
-      - v[0-9].**
+      - v[0-9]+.**
 
   pull_request:
     types:
@@ -16,6 +16,9 @@ on:
       - auto_merge_enabled
       - edited
 
+  merge_group:
+    types: [checks_requested]
+
 jobs:
   commitlint:
     runs-on: ubuntu-latest

.github/workflows/post-merge.yml

@@ -15,10 +15,5 @@ jobs:
           components: rustfmt
           toolchain: nightly-2024-01-12
       - uses: Swatinem/rust-cache@v2
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
-          cache: 'pip'
       - run:
-          pip install -r crates/blockifier/tests/requirements.txt;
           cargo test -- --include-ignored

Cargo.toml

@@ -0,0 +1,26 @@
+[workspace]
+# Using version 2 to avoid unifying features. For more info, read:
+#   https://doc.rust-lang.org/cargo/reference/resolver.html#feature-resolver-version-2
+resolver = "2"
+
+members = ["crates/committer"]
+
+[workspace.package]
+version = "0.1.0-rc.0"
+edition = "2021"
+repository = "https://github.com/starkware-libs/committer/"
+license = "Apache-2.0"
+license-file = "LICENSE"
+
+[workspace.dependencies]
+pretty_assertions = "1.2.1"
+
+[workspace.lints.rust]
+warnings = "deny"
+future-incompatible = "deny"
+nonstandard-style = "deny"
+rust-2018-idioms = "deny"
+unused = "deny"
+
+[workspace.lints.clippy]
+as_conversions = "deny"

commitlint.config.js

@@ -0,0 +1,53 @@
+const Configuration = {
+    /*
+     * Resolve and load @commitlint/config-conventional from node_modules.
+     * Referenced packages must be installed.
+     * See [the README](https://github.com/conventional-changelog/commitlint/blob/master/%40commitlint/config-conventional/README.md)
+     * for applied rules.
+     */
+    extends: ['@commitlint/config-conventional'],
+    /*
+     * Resolve and load conventional-changelog-atom from node_modules.
+     * Referenced packages must be installed
+     */
+    // parserPreset: 'conventional-changelog-atom',
+    /*
+     * Resolve and load @commitlint/format from node_modules.
+     * Referenced package must be installed
+     */
+    formatter: '@commitlint/format',
+    /*
+     * Any rules defined here will override rules from @commitlint/config-conventional
+     */
+    rules: {
+        'scope-enum': [2, 'always', [
+            'ci',
+        ]],
+    },
+    /*
+     * Functions that return true if commitlint should ignore the given message.
+     */
+    ignores: [(commit) => commit === ''],
+    /*
+     * Whether commitlint uses the default ignore rules.
+     */
+    defaultIgnores: true,
+    /*
+     * Custom URL to show upon failure
+     */
+    helpUrl:
+        'https://github.com/conventional-changelog/commitlint/#what-is-commitlint',
+    /*
+     * Custom prompt configs, not used currently.
+     */
+    prompt: {
+        messages: {},
+        questions: {
+            type: {
+                description: 'please input type:',
+            },
+        },
+    },
+};
+
+module.exports = Configuration;

crates/committer/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "committer"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license-file.workspace = true
+description = "Computes and manages Starknet state."
+
+[lints]
+workspace = true
+
+[dev-dependencies]
+pretty_assertions.workspace = true

crates/committer/src/lib.rs

@@ -0,0 +1,15 @@
+// TODO(Dori, 3/3/2024): Delete this dummy code.
+pub fn dummy() -> u8 {
+    7
+}
+
+#[cfg(test)]
+pub mod test {
+    use super::dummy;
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    fn test_dummy() {
+        assert_eq!(dummy(), 7);
+    }
+}

scripts/merge_paths.json

@@ -1,3 +1 @@
-{
-    "main-v0.13.1": "main"
-}
+{}

scripts/merge_paths_test.py

@@ -4,6 +4,10 @@
 def test_linear_path():
     merge_paths = load_merge_paths()
 
+    # No feature branches means nothing to test.
+    if len(merge_paths) == 0:
+        return
+
     src_dst_iter = iter(merge_paths.items())
     (oldest_branch, prev_dst_branch) = next(src_dst_iter)
     assert (