try to fix workflow

skip-mev · Dec 12, 2024 · 044e607 · 044e607
1 parent 90d7ca9
commit 044e607
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 30 deletions.
diff --git a/.github/workflows/sync-staging.yml b/.github/workflows/sync-staging.yml
@@ -19,21 +19,9 @@ jobs:
         with:
           ref: staging
 
-      - id: configure
-        name: configure
-        run: git config pull.ff true
-
-      - id: pull-main
-        name: Pull latest 'main'
-        run: git pull --ff-only origin main
-
-      - id: diff-check
-        name: Check if 'staging' is behind 'main'
-        run: git diff --exit-code origin/main
-
-      - id: fast-forward
-        name: Fast forward 'main' → 'staging'
-        run: git merge --ff-only origin/main
+      - id: merge-main-to-staging
+        name: Merge 'main' → 'staging'
+        run: git merge --no-ff main
 
       - id: push-staging
         name: Push latest 'staging'

diff --git a/packages/widget/src/devMode/loadWidget.tsx b/packages/widget/src/devMode/loadWidget.tsx
@@ -46,21 +46,6 @@ const DevMode = () => {
             routeConfig={{
               goFast: true,
             }}
-          // // @ts-expect-error - testing
-          // connectedAddress={{
-          //   "cosmoshub-4": "address",
-          //   "1": "0xaddress",
-          //   "solana": "address",
-          // }}
-          // getCosmosSigner={(chainId) => {
-          //   return getSigner(chainId)
-          // }}
-          // getEVMSigner={(chainId) => {
-          //   return getSigner(chainId)
-          // }}
-          // getSVMSigner={(chainId) => {
-          //   return getSigner(chainId)
-          // }}
           />
         </div>
       </Row>