Fix Smoketests CI (#126)

* fix smoketests ci * remove merge from upstream * first commit before pulling from master --------- Co-authored-by: claravanstaden <Cats 4 life!>
Snowfork · Mar 20, 2024 · cbcc449 · cbcc449
1 parent 4c850e8
commit cbcc449
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/smoketest.yml b/.github/workflows/smoketest.yml
@@ -29,14 +29,14 @@ jobs:
       - uses: actions/checkout@v2
         with:
           repository: snowfork/snowbridge
-          ref: smoketests-ci
+          ref: main
           path: snowbridge
           submodules: "true"
       - run: rm -f snowbridge/polkadot-sdk
       - uses: actions/checkout@v2
         with:
           repository: snowfork/polkadot-sdk
-          ref: main
+          ref: snowbridge
           path: snowbridge/polkadot-sdk
       - uses: arduino/setup-protoc@v2
         with:

diff --git a/bridges/snowbridge/scripts/contribute-upstream.sh b/bridges/snowbridge/scripts/contribute-upstream.sh
@@ -78,6 +78,8 @@ git fetch parity master
 git checkout parity/master -- .github
 git add -- .github
 
+git commit -m "cleanup branch"
+
 # Fetch the latest from parity master
 echo "Fetching latest from Parity master. Resolve merge conflicts, if there are any."
 git fetch parity master