Synchronize Scarb and Cairo versions (#687)

.github/workflows/nightly.yml

@@ -31,6 +31,12 @@ jobs:
       - name: Build xtasks
         run: cargo build -p xtask
 
+      - name: Upgrade Cairo to latest main commit
+        run: cargo xtask set-cairo-version --rev $(git ls-remote --refs "https://github.com/starkware-libs/cairo" main | awk '{print $1}')
+
+      - name: Rebuild xtasks after Cargo.toml changes
+        run: cargo build -p xtask
+
       - name: Determine nightly version
         id: version
         shell: bash
@@ -47,11 +53,11 @@ jobs:
           echo "nightly_version=$NIGHTLY_VERSION" >> $GITHUB_OUTPUT
           echo "nightly_branch=$NIGHTLY_BRANCH" >> $GITHUB_OUTPUT
 
-      - name: Upgrade Cairo to latest main commit
-        run: cargo xtask set-cairo-version --rev $(git ls-remote --refs "https://github.com/starkware-libs/cairo" main | awk '{print $1}')
+      - name: Set Scarb version build metadata
+        run: cargo xtask set-scarb-version --build ${{ env.NIGHTLY_TAG }}
 
-      - name: Set Scarb version
-        run: cargo xtask set-scarb-version ${{ env.NIGHTLY_VERSION }}
+      - name: Rebuild xtasks after Cargo.toml changes
+        run: cargo build -p xtask
 
       - name: Compose release notes
         run: cargo xtask nightly-release-notes > NIGHTLY_RELEASE_NOTES.md

Cargo.toml

@@ -15,7 +15,7 @@ members = [
 "resolver" = "2"
 
 [workspace.package]
-version = "0.7.0"
+version = "2.2.0"
 edition = "2021"
 
 authors = ["Software Mansion <[email protected]>"]
@@ -28,19 +28,19 @@ repository = "https://github.com/software-mansion/scarb"
 anyhow = "1.0.75"
 assert_fs = "1.0.13"
 async-trait = "0.1.73"
-cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", branch = "main" }
-cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", branch = "main" }
-cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", branch = "main" }
-cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", branch = "main" }
-cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", branch = "main" }
-cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", branch = "main" }
-cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", branch = "main" }
-cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", branch = "main" }
-cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", branch = "main" }
-cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", branch = "main" }
-cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", branch = "main" }
-cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", branch = "main" }
-cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", branch = "main", features = ["env_logger"] }
+cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "70e67af" }
+cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "70e67af" }
+cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "70e67af" }
+cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "70e67af" }
+cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "70e67af" }
+cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "70e67af" }
+cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "70e67af" }
+cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "70e67af" }
+cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "70e67af" }
+cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "70e67af" }
+cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "70e67af" }
+cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "70e67af" }
+cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "70e67af", features = ["env_logger"] }
 camino = { version = "1.1.6", features = ["serde1"] }
 cargo_metadata = "0.17.0"
 clap = { version = "4.4.3", features = ["derive", "env", "string"] }