Bump deps, use scarb in nightly

commit-id:fa08970b

Author: cptartur

.github/workflows/_build-plugin-binaries.yml

@@ -111,7 +111,7 @@ jobs:
           
           PACKAGE_NAME=${{ inputs.plugin_name }}
           PACKAGE_NAME=${PACKAGE_NAME//-/_}  # Replace `-` with `_` in name
-          PACKAGE_VERSION=$(get_version "${{ inputs.overridden_plugin_version }}")
+          PACKAGE_VERSION=$(get_version "${{ inputs.overridden_plugin_version }}" "crates/${{ inputs.plugin_name }}/Scarb.toml")
 
           TARGET="${{ matrix.target }}"
           EXT="${{ matrix.ext }}"

.github/workflows/_publish-plugin.yml

@@ -31,7 +31,7 @@ jobs:
           
           plugin_name_underscores=${{ inputs.plugin_name }}
           plugin_name_underscores=${plugin_name_underscores//-/_}
-          plugin_version=$(get_version "${{ inputs.overridden_plugin_version }}")
+          plugin_version=$(get_version "${{ inputs.overridden_plugin_version }}" "crates/${{ inputs.plugin_name }}/Scarb.toml")
           
           registry_url=${{ inputs.prod_registry == true && 'https://scarbs.xyz' || 'https://scarbs.dev' }}
           plugin_uploaded=$(curl -s ${registry_url}/api/v1/index/sn/fo/${plugin_name_underscores}.json | jq --arg version "$plugin_version" '[.[] | select(.v == $version)] | length > 0')
@@ -78,7 +78,7 @@ jobs:
           fi
 
       - name: Publish ${{ inputs.plugin_name }}
-        if: needs.check-uploaded.outputs.plugin_uploaded == 'false' || github.event_name == 'workflow_dispatch'
+        if: needs.check-uploaded.outputs.plugin_uploaded == 'false'
         working-directory: crates/${{ inputs.plugin_name }}
         run: |
           set -exo pipefail
@@ -87,4 +87,4 @@ jobs:
           update_version_in_file "Scarb.toml" "${{ inputs.overridden_plugin_version }}"
           update_version_in_file "Cargo.toml" "${{ inputs.overridden_plugin_version }}"
 
-          scarb publish --allow-dirty ${{ inputs.prod_registry == true && ' ' || '--index https://scarbs.dev/' }}
+          scarb publish --allow-dirty ${{ inputs.prod_registry == true && ' ' || '--index https://scarbs.dev/' }} ${{ inputs.overridden_plugin_version == 'snforge-scarb-plugin-deprecated' && '--ignore-cairo-version' || ' ' }} 

.github/workflows/ci.yml

@@ -147,7 +147,7 @@ jobs:
       - run: cargo test --package forge --features scarb_2_9_1 --test main e2e::requirements::test_warning_on_scarb_version_below_recommended
       - run: cargo test --package forge --features scarb_2_9_1 --lib compatibility_check::tests::warning_requirements
       - run: cargo test --package forge --features scarb_2_9_1 --test main e2e::running::sierra_gas_with_older_scarb
-      - run: cargo test --package forge --features scarb_2_9_1 --test main e2e::new::init_new_project_from_scarb_with_snforge_std_compatibility
+      - run: cargo test --package forge --features scarb_2_9_1 --test main e2e::new::init_new_project_from_scarb_with_snforge_std_deprecated
 
   # TODO(#3212): Closures in Cairo are fully supported since version 2.11
   test-interact-with-state:
@@ -219,8 +219,8 @@ jobs:
         working-directory: crates/snforge-scarb-plugin
         run: cargo test --release
 
-  test-forge-scarb-plugin-compatibility:
-    name: Test Forge Scarb Plugin Compatibility
+  test-forge-scarb-plugin-deprecated:
+    name: Test Forge Scarb Plugin Deprecated
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -229,7 +229,7 @@ jobs:
       - uses: software-mansion/setup-scarb@v1
       - uses: software-mansion/setup-universal-sierra-compiler@v1
       - name: Run Forge Scarb Plugin tests
-        working-directory: crates/snforge-scarb-plugin-compatibility
+        working-directory: crates/snforge-scarb-plugin-deprecated
         run: cargo test --release
 
   test-cast:
@@ -287,7 +287,7 @@ jobs:
       - uses: software-mansion/setup-scarb@v1
       - name: Check cairo files format
         run: |
-          output=$(find . -type f -name "Scarb.toml" -not -path "*/snforge_std_compatibility/*" -execdir sh -c '
+          output=$(find . -type f -name "Scarb.toml" -not -path "*/snforge_std_deprecated/*" -execdir sh -c '
               echo "Running \"scarb fmt\" in directory: $PWD"
               scarb fmt --check
           ' \;)

.github/workflows/nightly.yml

@@ -48,6 +48,8 @@ jobs:
           echo "nightly_version=$NIGHTLY_VERSION" >> $GITHUB_OUTPUT
           echo "nightly_branch=$NIGHTLY_BRANCH" >> $GITHUB_OUTPUT
 
+      - uses: software-mansion/setup-scarb@v1
+
       - name: Update metadata before release
         run: ./scripts/release.sh ${{ env.NIGHTLY_VERSION }}
 
@@ -84,16 +86,16 @@ jobs:
       ref: ${{ needs.prepare.outputs.nightly_branch }}
       plugin_name: "snforge-scarb-plugin"
 
-  build-compatibility-plugin-binaries:
-    # This job is not necessary for nightly releases, but we still publish compatibility plugin for
+  build-deprecated-plugin-binaries:
+    # This job is not necessary for nightly releases, but we still publish deprecated plugin for
     # the sake of consistency with the normal release workflow.
-    name: Build compatibility plugin binaries
+    name: Build deprecated plugin binaries
     needs: prepare
     uses: ./.github/workflows/_build-plugin-binaries.yml
     with:
       overridden_plugin_version: ${{ needs.prepare.outputs.nightly_version }}
       ref: ${{ needs.prepare.outputs.nightly_branch }}
-      plugin_name: "snforge-scarb-plugin-compatibility"
+      plugin_name: "snforge-scarb-plugin-deprecated"
 
   publish-plugin:
     needs: [ prepare, build-plugin-binaries ]
@@ -105,20 +107,20 @@ jobs:
       plugin_name: "snforge-scarb-plugin"
 
 
-  publish-compatibility-plugin:
-    # This job is not necessary for nightly releases, but we still publish compatibility plugin for
+  publish-deprecated-plugin:
+    # This job is not necessary for nightly releases, but we still publish deprecated plugin for
     # the sake of consistency with the normal release workflow.
-    needs: [ prepare, build-compatibility-plugin-binaries ]
+    needs: [ prepare, build-deprecated-plugin-binaries ]
     uses: ./.github/workflows/_publish-plugin.yml
     secrets: inherit
     with:
       prod_registry: false
       overridden_plugin_version: ${{ needs.prepare.outputs.nightly_version }}
-      plugin_name: "snforge-scarb-plugin-compatibility"
+      plugin_name: "snforge-scarb-plugin-deprecated"
 
 
   publish-std:
-    needs: [ prepare, publish-plugin, publish-compatibility-plugin ]
+    needs: [ prepare, publish-plugin, publish-deprecated-plugin ]
     uses: ./.github/workflows/publish-std.yml
     secrets: inherit
     with:
@@ -128,7 +130,7 @@ jobs:
 
   test-binary:
     name: Test binary
-    needs: [ prepare, build-binaries, build-plugin-binaries, publish-plugin, publish-compatibility-plugin, publish-std ]
+    needs: [ prepare, build-binaries, build-plugin-binaries, publish-plugin, publish-deprecated-plugin, publish-std ]
     uses: ./.github/workflows/_test-binaries.yml
     secrets: inherit
     with:

.github/workflows/publish-std.yml

@@ -31,9 +31,39 @@ on:
         type: string
 
 jobs:
+  check-uploaded:
+    name: Check stds uploaded
+    runs-on: ubuntu-latest
+    outputs:
+      snforge_std_uploaded: ${{ steps.check-uploaded.outputs.snforge_std_uploaded }}
+      snforge_std_deprecated_uploaded: ${{ steps.check-uploaded.outputs.snforge_std_deprecated_uploaded }}
+      sncast_std_uploaded: ${{ steps.check-uploaded.outputs.sncast_std_uploaded }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Check version
+        id: check-uploaded
+        run: |
+          set -exo pipefail
+          
+          source scripts/handle_version.sh
+          
+          snforge_std_version=$(get_version "${{ inputs.override_std_version }}" "snforge_std")
+          snforge_std_deprecated_version=$(get_version "${{ inputs.override_std_version }}" "snforge_std_compatibilty")
+          sncast_std_version=$(get_version "${{ inputs.override_std_version }}" "sncast_std")
+          
+          registry_url=${{ inputs.prod_registry == true && 'https://scarbs.xyz' || 'https://scarbs.dev' }}
+          
+          snforge_std_uploaded=$(curl -s ${registry_url}/api/v1/index/sn/fo/snforge_std.json | jq --arg version "$snforge_std_version" '[.[] | select(.v == $version)] | length > 0')
+          snforge_std_deprecated_uploaded=$(curl -s ${registry_url}/api/v1/index/sn/fo/snforge_std_deprecated.json | jq --arg version "$snforge_std_deprecated_version" '[.[] | select(.v == $version)] | length > 0')
+          sncast_std_uploaded=$(curl -s ${registry_url}/api/v1/index/sn/ca/sncast_std.json | jq --arg version "$sncast_std_version" '[.[] | select(.v == $version)] | length > 0')
+          
+          echo "snforge_std_uploaded=$snforge_std_uploaded" >> $GITHUB_OUTPUT
+          echo "snforge_std_deprecated_uploaded=$snforge_std_deprecated_uploaded" >> $GITHUB_OUTPUT
+          echo "sncast_std_uploaded=$sncast_std_uploaded" >> $GITHUB_OUTPUT
   publish-to-registry:
     name: Publish packages to the registry
     runs-on: ubuntu-latest
+    needs: [ check-uploaded ]
     env:
       SCARB_REGISTRY_AUTH_TOKEN: ${{ inputs.prod_registry == true && secrets.SCARB_REGISTRY_AUTH_TOKEN || secrets.DEV_SCARB_REGISTRY_AUTH_TOKEN }}
     steps:
@@ -46,6 +76,7 @@ jobs:
       - uses: software-mansion/setup-scarb@v1
 
       - name: Publish sncast_std
+        if: needs.check-uploaded.outputs.sncast_std_uploaded == 'false'
         working-directory: sncast_std
         run: |
           source ../scripts/handle_version.sh
@@ -55,6 +86,7 @@ jobs:
           scarb publish --allow-dirty ${{ inputs.prod_registry == true && ' ' || '--index https://scarbs.dev/' }}
 
       - name: Publish snforge_std
+        if: needs.check-uploaded.outputs.snforge_std_uploaded == 'false'
         working-directory: snforge_std
         run: |
           source ../scripts/handle_version.sh
@@ -70,18 +102,19 @@ jobs:
           
           scarb publish --allow-dirty ${{ inputs.prod_registry == true && ' ' || '--index https://scarbs.dev/' }}
 
-      - name: Publish snforge_std_compatibility
-        working-directory: snforge_std_compatibility
+      - name: Publish snforge_std_deprecated
+        if: needs.check-uploaded.outputs.snforge_std_deprecated_uploaded == 'false'
+        working-directory: snforge_std_deprecated
         run: |
           source ../scripts/handle_version.sh
 
           update_version_in_file "Scarb.toml" "${{ inputs.override_std_version }}"
 
           if ${{ inputs.prod_registry == true }}; then
-            scarb add snforge_scarb_plugin_compatibility@${{ inputs.plugin_dep_version }}
+            scarb add snforge_scarb_plugin_deprecated@${{ inputs.plugin_dep_version }}
           else
-            sed -i.bak "/snforge_scarb_plugin_compatibility/ s/\(snforge_scarb_plugin_compatibility = \).*/\1{ version = \"=${{ inputs.plugin_dep_version }}\", registry = \"https:\/\/scarbs.dev\/\" }/" Scarb.toml
+            sed -i.bak "/snforge_scarb_plugin_deprecated/ s/\(snforge_scarb_plugin_deprecated = \).*/\1{ version = \"=${{ inputs.plugin_dep_version }}\", registry = \"https:\/\/scarbs.dev\/\" }/" Scarb.toml
             rm Scarb.toml.bak 2>/dev/null
           fi
 
-          scarb publish --allow-dirty ${{ inputs.prod_registry == true && ' ' || '--index https://scarbs.dev/' }}
+          scarb publish --allow-dirty ${{ inputs.prod_registry == true && ' ' || '--index https://scarbs.dev/' }} --ignore-cairo-version

.github/workflows/release.yml

@@ -72,13 +72,13 @@ jobs:
     with:
       plugin_name: "snforge-scarb-plugin"
 
-  build-compatibility-plugin-binaries:
-    name: Build compatibility plugin binaries
+  build-deprecated-plugin-binaries:
+    name: Build deprecated plugin binaries
     if: ${{ needs.verify-version.outputs.versionIsValid == 'true' }}
     needs: verify-version
     uses: ./.github/workflows/_build-plugin-binaries.yml
     with:
-      plugin_name: "snforge-scarb-plugin-compatibility"
+      plugin_name: "snforge-scarb-plugin-deprecated"
 
   dev-publish-plugin:
     needs: [verify-version, build-plugin-binaries]
@@ -89,17 +89,17 @@ jobs:
       overridden_plugin_version: ${{ needs.verify-version.outputs.version }}-test.${{ github.run_id }}
       plugin_name: "snforge-scarb-plugin"
 
-  dev-publish-compatibility-plugin:
-    needs: [ verify-version, build-compatibility-plugin-binaries ]
+  dev-publish-deprecated-plugin:
+    needs: [ verify-version, build-deprecated-plugin-binaries ]
     if: ${{ needs.verify-version.outputs.versionIsValid == 'true' }}
     uses: ./.github/workflows/_publish-plugin.yml
     secrets: inherit
     with:
       overridden_plugin_version: ${{ needs.verify-version.outputs.version }}-test.${{ github.run_id }}
-      plugin_name: "snforge-scarb-plugin-compatibility"
+      plugin_name: "snforge-scarb-plugin-deprecated"
 
   dev-publish-std:
-    needs: [verify-version, dev-publish-plugin, dev-publish-compatibility-plugin]
+    needs: [verify-version, dev-publish-plugin, dev-publish-deprecated-plugin]
     if: ${{ needs.verify-version.outputs.versionIsValid == 'true' }}
     uses: ./.github/workflows/publish-std.yml
     secrets: inherit
@@ -109,7 +109,7 @@ jobs:
 
   test-binary:
     name: Test binary
-    needs: [build-binaries, verify-version, dev-publish-std, dev-publish-plugin, dev-publish-compatibility-plugin]
+    needs: [build-binaries, verify-version, dev-publish-std, dev-publish-plugin, dev-publish-deprecated-plugin]
     uses: ./.github/workflows/_test-binaries.yml
     secrets: inherit
     with:
@@ -160,18 +160,18 @@ jobs:
       prod_registry: true
       plugin_name: "snforge-scarb-plugin"
 
-  publish-snforge-scarb-plugin-compatibility:
-    name: Publish snforge_scarb_plugin_compatibility
+  publish-snforge-scarb-plugin-deprecated:
+    name: Publish snforge_scarb_plugin_deprecated
     needs: [ test-binary, create-release ]
     uses: ./.github/workflows/_publish-plugin.yml
     secrets: inherit
     with:
       prod_registry: true
-      plugin_name: "snforge-scarb-plugin-compatibility"
+      plugin_name: "snforge-scarb-plugin-deprecated"
 
   publish-to-registry:
     name: Publish packages to the registry
-    needs: [ verify-version, publish-snforge-scarb-plugin, publish-snforge-scarb-plugin-compatibility ]
+    needs: [ verify-version, publish-snforge-scarb-plugin, publish-snforge-scarb-plugin-deprecated ]
     uses: ./.github/workflows/publish-std.yml
     secrets: inherit
     with:

.github/workflows/scheduled.yml

@@ -137,7 +137,7 @@ jobs:
         uses: mikefarah/yq@8bf425b4d1344db7cd469a8d10a390876e0c77fd
         with:
           cmd: yq -oy '.workspace.package.version' 'Cargo.toml'
-          
+
       - name: Return version
         id: validVersion
         run: |
@@ -154,39 +154,39 @@ jobs:
       plugin_name: 'snforge-scarb-plugin'
 
   publish-plugin:
-    needs: [get-version, build-plugin-binaries]
+    needs: [ get-version, build-plugin-binaries ]
     uses: ./.github/workflows/_publish-plugin.yml
     secrets: inherit
     with:
       overridden_plugin_version: ${{ needs.get-version.outputs.version }}-test.${{ github.run_id }}
       plugin_name: 'snforge-scarb-plugin'
 
-  build-compatibility-plugin-binaries:
-    name: Build compatibility plugin binaries
+  build-deprecated-plugin-binaries:
+    name: Build deprecated plugin binaries
     needs: get-version
     uses: ./.github/workflows/_build-plugin-binaries.yml
     with:
       overridden_plugin_version: ${{ needs.get-version.outputs.version }}-test.${{ github.run_id }}
-      plugin_name: 'snforge-scarb-plugin-compatibility'
+      plugin_name: 'snforge-scarb-plugin-deprecated'
 
-  publish-compatibility-plugin:
-    needs: [get-version, build-compatibility-plugin-binaries]
+  publish-deprecated-plugin:
+    needs: [ get-version, build-deprecated-plugin-binaries ]
     uses: ./.github/workflows/_publish-plugin.yml
     secrets: inherit
     with:
       overridden_plugin_version: ${{ needs.get-version.outputs.version }}-test.${{ github.run_id }}
-      plugin_name: 'snforge-scarb-plugin-compatibility'
+      plugin_name: 'snforge-scarb-plugin-deprecated'
 
   publish-std:
-    needs: [get-version, publish-plugin, publish-compatibility-plugin]
+    needs: [ get-version, publish-plugin, publish-deprecated-plugin ]
     uses: ./.github/workflows/publish-std.yml
     secrets: inherit
     with:
       plugin_dep_version: ${{ needs.get-version.outputs.version }}-test.${{ github.run_id }}
       override_std_version: ${{ needs.get-version.outputs.version }}-test.${{ github.run_id }}
 
   build-binaries:
-    needs: [get-version]
+    needs: [ get-version ]
     uses: ./.github/workflows/_build-binaries.yml
     with:
       version: ${{ needs.get-version.outputs.version }}-test.${{ github.run_id }}