fix: revert usd-integration temp changes

GaloyMoney · Jun 7, 2022 · dde36f9 · dde36f9
1 parent f87a451
commit dde36f9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -143,7 +143,7 @@ jobs:
           paths:
             - node_modules
             - ios/Pods
-      - run: git checkout usd-integration
+      - run: git checkout main
       - run: yarn jest
       - run: sed -i'' -e "s/GOOGLE_SERVICE_FIREBASE_API_KEY/$GOOGLE_SERVICE_FIREBASE_API_KEY/" ios/GoogleService-Info.plist
       - run: sed -i'' -e "s/MARKETING_VERSION.*/MARKETING_VERSION = $CIRCLE_TAG;/g" ios/GaloyApp.xcodeproj/project.pbxproj
@@ -155,10 +155,10 @@ jobs:
       - run: git config --global user.name "circleci-bot"
       - run: git config --global user.email "bot@circleci.com"
       - run: git config pull.rebase false
-      - run: git pull https://${GITHUB_TOKEN}@github.com/GaloyMoney/galoy-mobile.git usd-integration
+      - run: git pull https://${GITHUB_TOKEN}@github.com/GaloyMoney/galoy-mobile.git main
       - run: git commit -a -m "new ios build [ci skip]"
       - run: git reset -- GoogleService-Info.plist
-      - run: git push -q https://${GITHUB_TOKEN}@github.com/GaloyMoney/galoy-mobile.git usd-integration
+      - run: git push -q https://${GITHUB_TOKEN}@github.com/GaloyMoney/galoy-mobile.git main
       - run: gh release upload $CIRCLE_TAG "output/gym/Bitcoin Beach.ipa" --clobber
       - store_artifacts:
           path: ios/output
@@ -213,7 +213,7 @@ jobs:
           paths:
             - node_modules
 
-      - run: git checkout usd-integration
+      - run: git checkout main
       - run: yarn jest
       - run: echo $JAVA_OPTS
       - run: echo $GRADLE_OPTS
@@ -223,11 +223,11 @@ jobs:
       - run: git config --global user.name "circleci-bot"
       - run: git config --global user.email "bot@circleci.com"
       - run: git config pull.rebase false
-      - run: git pull origin usd-integration
+      - run: git pull origin main
       - run: cd ~/galoy-mobile
       - run: git add --force android/app/build/generated/sourcemaps/react/release
       - run: git commit -a -m "new android build [ci skip]"
-      - run: git push -q https://${GITHUB_TOKEN}@github.com/GaloyMoney/galoy-mobile.git usd-integration
+      - run: git push -q https://${GITHUB_TOKEN}@github.com/GaloyMoney/galoy-mobile.git main
 
       - run: gh release upload $CIRCLE_TAG "app/build/outputs/apk/release/app-release.apk" --clobber
       - store_artifacts:

diff --git a/.github/workflows/check-code.yml b/.github/workflows/check-code.yml
@@ -1,7 +1,7 @@
 name: "Check code"
 on:
   pull_request:
-    branches: [main, usd-integration]
+    branches: [main]
 jobs:
   check-code:
     name: Check Code

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,7 +1,7 @@
 name: "Test"
 on:
   pull_request:
-    branches: [main, usd-integration]
+    branches: [main]
 jobs:
   check-code:
     name: Tests