Merge branch 'feat-token-extensions' of https://github.com/astraly-la…

…bs/hyperlane_starknet into feat-token-extensions
astraly-labs · Aug 10, 2024 · 93f74eb · 93f74eb
2 parents 5668062 + 953e887
commit 93f74eb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ name: release
 on:
   push:
     tags:
-      - 'v*.*.*'
+      - "v*.*.*"
 
 jobs:
   artifact:
@@ -12,11 +12,13 @@ jobs:
       pull-requests: write
     name: artifact
     runs-on: ubuntu-latest
-    env: 
+    env:
       working-directory: ./contracts
     steps:
       - uses: actions/checkout@v4
       - uses: software-mansion/setup-scarb@v1
+        with:
+          scarb-version: "2.6.5"
       - name: Build contracts
         working-directory: ${{ env.working-directory}}
         run: scarb build
@@ -41,7 +43,7 @@ jobs:
           cd ..
           sha256sum hyperlane-starknet-${{ github.ref_name }}.zip > hyperlane-starknet-${{ github.ref_name }}.CHECKSUM
           md5sum hyperlane-starknet-${{ github.ref_name }}.zip > hyperlane-starknet-${{ github.ref_name }}.CHECKSUM.MD5
-  
+
       - name: Find zip files
         working-directory: ${{ env.working-directory}}
         run: |
@@ -55,5 +57,3 @@ jobs:
             ./contracts/hyperlane-starknet-${{ github.ref_name }}.zip
             ./contracts/hyperlane-starknet-${{ github.ref_name }}.CHECKSUM
             ./contracts/hyperlane-starknet-${{ github.ref_name }}.CHECKSUM.MD5
-
-            
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -17,10 +17,12 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
       - uses: software-mansion/setup-scarb@v1
+        with:
+          scarb-version: "2.6.5"
 
       - name: Build contracts
         run: |
-          cd contracts && scarb build
+          cd cairo && scarb build
 
       - name: Build the rust code
         run: |
@@ -29,7 +31,7 @@ jobs:
       - name: Install dojoup
         run: |
           curl -L https://install.dojoengine.org | bash
-      
+
       - name: Install dojo
         run: |-
           /home/runner/.config/.dojo/bin/dojoup -v 0.7.0-alpha.2
@@ -53,9 +55,7 @@ jobs:
       - name: run katana
         run: |
           katana -b 1000 &
-          
+
       - name: Run strk -> evm test
         run: |
           cd rust && cargo test -- test_mailbox_strk_to_evm
-
-        
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,15 +6,17 @@ on:
 jobs:
   contracts:
     runs-on: ubuntu-latest
-    env: 
-      working-directory: ./contracts
+    env:
+      working-directory: ./cairo
     steps:
       - uses: actions/checkout@v3
-      
+
       - uses: software-mansion/setup-scarb@v1
+        with:
+          scarb-version: "2.6.5"
       - uses: foundry-rs/setup-snfoundry@v3
         with:
-          starknet-foundry-version: '0.22.0'
+          starknet-foundry-version: "0.22.0"
       - working-directory: ${{ env.working-directory}}
         run: scarb fmt --check
 
@@ -29,6 +31,3 @@ jobs:
         run: scarb build
       - working-directory: ${{ env.working-directory}}
         run: snforge test
-
-
-