Add PR step inside increment job

ephemeraHQ · Aug 23, 2024 · 150c9dd · 150c9dd
1 parent 16897db
commit 150c9dd
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 115 deletions.
diff --git a/.github/workflows/build-internal.yml b/.github/workflows/build-internal.yml
@@ -8,97 +8,94 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-android:
-    runs-on: ubuntu-latest
-    environment: Production
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: "18"
-
-      - name: Install dependencies
-        run: yarn install
-
-      - name: 🏗 Setup EAS
-        uses: expo/expo-github-action@v8
-        with:
-          eas-version: latest
-          token: ${{ secrets.EXPO_TOKEN }}
-
-      - name: Create .env file from secrets
-        run: |
-          echo "EXPO_PUBLIC_CONTACT_ADDRESS=${{ secrets.EXPO_PUBLIC_CONTACT_ADDRESS }}" >> .env.production
-          echo "EXPO_PUBLIC_DEBUG_ADDRESSES=${{ secrets.EXPO_PUBLIC_DEBUG_ADDRESSES }}" >> .env.production
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.EXPO_PUBLIC_SENTRY_DSN }}" >> .env.production
-          echo "EXPO_PUBLIC_WALLETCONNECT_PROJECT_ID=${{ secrets.EXPO_PUBLIC_WALLETCONNECT_PROJECT_ID }}" >> .env.production
-          echo "EXPO_PUBLIC_THIRDWEB_CLIENT_ID=${{ secrets.EXPO_PUBLIC_THIRDWEB_CLIENT_ID }}" >> .env.production
-          echo "EXPO_PUBLIC_EXPO_PROJECT_ID=${{ secrets.EXPO_PUBLIC_EXPO_PROJECT_ID }}" >> .env.production
-          echo "EXPO_PUBLIC_PRIVY_APP_ID=${{ secrets.EXPO_PUBLIC_PRIVY_APP_ID }}" >> .env.production
-          echo "EXPO_PUBLIC_EVM_RPC_ENDPOINT=${{ secrets.EXPO_PUBLIC_EVM_RPC_ENDPOINT }}" >> .env.production
-
-      - name: Update EAS config with env variables
-        run: node scripts/build/eas.js --env production
-
-      - name: Update Android Files
-        # TODO: This should be handled by build configs in the future
-        run: node scripts/build/android/production.js
-
-      - name: Build for Android
-        run: eas build --profile production-android --platform android --non-interactive --auto-submit --no-wait
-
-  build-ios:
-    runs-on: ubuntu-latest
-    environment: Production
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: "18"
-
-      - name: Install dependencies
-        run: yarn install
-
-      - name: 🏗 Setup EAS
-        uses: expo/expo-github-action@v8
-        with:
-          eas-version: latest
-          token: ${{ secrets.EXPO_TOKEN }}
-
-      - name: Create .env file from secrets
-        run: |
-          echo "EXPO_PUBLIC_CONTACT_ADDRESS=${{ secrets.EXPO_PUBLIC_CONTACT_ADDRESS }}" >> .env.production
-          echo "EXPO_PUBLIC_DEBUG_ADDRESSES=${{ secrets.EXPO_PUBLIC_DEBUG_ADDRESSES }}" >> .env.production
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.EXPO_PUBLIC_SENTRY_DSN }}" >> .env.production
-          echo "EXPO_PUBLIC_WALLETCONNECT_PROJECT_ID=${{ secrets.EXPO_PUBLIC_WALLETCONNECT_PROJECT_ID }}" >> .env.production
-          echo "EXPO_PUBLIC_THIRDWEB_CLIENT_ID=${{ secrets.EXPO_PUBLIC_THIRDWEB_CLIENT_ID }}" >> .env.production
-          echo "EXPO_PUBLIC_EXPO_PROJECT_ID=${{ secrets.EXPO_PUBLIC_EXPO_PROJECT_ID }}" >> .env.production
-          echo "EXPO_PUBLIC_PRIVY_APP_ID=${{ secrets.EXPO_PUBLIC_PRIVY_APP_ID }}" >> .env.production
-          echo "EXPO_PUBLIC_EVM_RPC_ENDPOINT=${{ secrets.EXPO_PUBLIC_EVM_RPC_ENDPOINT }}" >> .env.production
-
-      - name: Update EAS config with env variables
-        run: node scripts/build/eas.js --env production
-
-      - name: Update iOS Files
-        # TODO: This should be handled by schemes in the future
-        run: node scripts/build/ios/production.js
-
-      - name: Build for iOS
-        run: eas build --profile production-ios --platform ios --non-interactive --auto-submit --no-wait
+  # build-android:
+  #   runs-on: ubuntu-latest
+  #   environment: Production
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@v2
+
+  #     - name: Set up Node.js
+  #       uses: actions/setup-node@v2
+  #       with:
+  #         node-version: "18"
+
+  #     - name: Install dependencies
+  #       run: yarn install
+
+  #     - name: 🏗 Setup EAS
+  #       uses: expo/expo-github-action@v8
+  #       with:
+  #         eas-version: latest
+  #         token: ${{ secrets.EXPO_TOKEN }}
+
+  #     - name: Create .env file from secrets
+  #       run: |
+  #         echo "EXPO_PUBLIC_CONTACT_ADDRESS=${{ secrets.EXPO_PUBLIC_CONTACT_ADDRESS }}" >> .env.production
+  #         echo "EXPO_PUBLIC_DEBUG_ADDRESSES=${{ secrets.EXPO_PUBLIC_DEBUG_ADDRESSES }}" >> .env.production
+  #         echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.EXPO_PUBLIC_SENTRY_DSN }}" >> .env.production
+  #         echo "EXPO_PUBLIC_WALLETCONNECT_PROJECT_ID=${{ secrets.EXPO_PUBLIC_WALLETCONNECT_PROJECT_ID }}" >> .env.production
+  #         echo "EXPO_PUBLIC_THIRDWEB_CLIENT_ID=${{ secrets.EXPO_PUBLIC_THIRDWEB_CLIENT_ID }}" >> .env.production
+  #         echo "EXPO_PUBLIC_EXPO_PROJECT_ID=${{ secrets.EXPO_PUBLIC_EXPO_PROJECT_ID }}" >> .env.production
+  #         echo "EXPO_PUBLIC_PRIVY_APP_ID=${{ secrets.EXPO_PUBLIC_PRIVY_APP_ID }}" >> .env.production
+  #         echo "EXPO_PUBLIC_EVM_RPC_ENDPOINT=${{ secrets.EXPO_PUBLIC_EVM_RPC_ENDPOINT }}" >> .env.production
+
+  #     - name: Update EAS config with env variables
+  #       run: node scripts/build/eas.js --env production
+
+  #     - name: Update Android Files
+  #       # TODO: This should be handled by build configs in the future
+  #       run: node scripts/build/android/production.js
+
+  #     - name: Build for Android
+  #       run: eas build --profile production-android --platform android --non-interactive --auto-submit --no-wait
+
+  # build-ios:
+  #   runs-on: ubuntu-latest
+  #   environment: Production
+
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@v2
+
+  #     - name: Set up Node.js
+  #       uses: actions/setup-node@v2
+  #       with:
+  #         node-version: "18"
+
+  #     - name: Install dependencies
+  #       run: yarn install
+
+  #     - name: 🏗 Setup EAS
+  #       uses: expo/expo-github-action@v8
+  #       with:
+  #         eas-version: latest
+  #         token: ${{ secrets.EXPO_TOKEN }}
+
+  #     - name: Create .env file from secrets
+  #       run: |
+  #         echo "EXPO_PUBLIC_CONTACT_ADDRESS=${{ secrets.EXPO_PUBLIC_CONTACT_ADDRESS }}" >> .env.production
+  #         echo "EXPO_PUBLIC_DEBUG_ADDRESSES=${{ secrets.EXPO_PUBLIC_DEBUG_ADDRESSES }}" >> .env.production
+  #         echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.EXPO_PUBLIC_SENTRY_DSN }}" >> .env.production
+  #         echo "EXPO_PUBLIC_WALLETCONNECT_PROJECT_ID=${{ secrets.EXPO_PUBLIC_WALLETCONNECT_PROJECT_ID }}" >> .env.production
+  #         echo "EXPO_PUBLIC_THIRDWEB_CLIENT_ID=${{ secrets.EXPO_PUBLIC_THIRDWEB_CLIENT_ID }}" >> .env.production
+  #         echo "EXPO_PUBLIC_EXPO_PROJECT_ID=${{ secrets.EXPO_PUBLIC_EXPO_PROJECT_ID }}" >> .env.production
+  #         echo "EXPO_PUBLIC_PRIVY_APP_ID=${{ secrets.EXPO_PUBLIC_PRIVY_APP_ID }}" >> .env.production
+  #         echo "EXPO_PUBLIC_EVM_RPC_ENDPOINT=${{ secrets.EXPO_PUBLIC_EVM_RPC_ENDPOINT }}" >> .env.production
+
+  #     - name: Update EAS config with env variables
+  #       run: node scripts/build/eas.js --env production
+
+  #     - name: Update iOS Files
+  #       # TODO: This should be handled by schemes in the future
+  #       run: node scripts/build/ios/production.js
+
+  #     - name: Build for iOS
+  #       run: eas build --profile production-ios --platform ios --non-interactive --auto-submit --no-wait
 
   increment-build-numbers:
     runs-on: ubuntu-latest
-    needs: [build-android, build-ios]
-    outputs:
-      branch-name: ${{ steps.create_branch.outputs.branch-name }}
-      new_ios_build_number: ${{ steps.increment_version.outputs.new_ios_build_number }}
+    # needs: [build-android, build-ios]
 
     steps:
       - name: Checkout repository
@@ -109,38 +106,14 @@ jobs:
         with:
           node-version: "18"
 
-      - name: Create a new branch
-        id: create_branch
-        run: |
-          BRANCH_NAME="increment-version-$(date +'%Y%m%d%H%M%S')"
-          echo "branch-name=$BRANCH_NAME" >> $GITHUB_OUTPUT
-
       - name: Increment version numbers
         run: node scripts/build/incrementBuildNumbers.js
 
-      - name: Commit changes
-        run: |
-          git config --global user.name 'github-actions[bot]'
-          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          git add app.json
-          git commit -m "Increment version numbers"
-
-      - name: Push changes
-        run: git push origin HEAD:${{ steps.create_branch.outputs.branch-name }}
-
-  create-pull-request:
-    runs-on: ubuntu-latest
-    needs: increment-build-numbers
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ needs.increment-build-numbers.outputs.branch-name }}
+          branch: increment-version
           title: "Increment version numbers"
           body: "This PR increments the buildNumber for iOS and the versionCode for Android."
-          base: main # Change the base branch if needed
+          base: main
diff --git a/scripts/build/incrementBuildNumbers.js b/scripts/build/incrementBuildNumbers.js
@@ -17,4 +17,3 @@ appJson.expo.android.versionCode = appJson.expo.android.versionCode + 1;
 fs.writeFileSync(filePath, JSON.stringify(appJson, null, 2) + "\n", "utf-8");
 
 console.log("Version numbers incremented successfully.");
-console.log(`::set-output name=new_ios_build_number::${newBuildNumber}`);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,3 @@ appJson.expo.android.versionCode = appJson.expo.android.versionCode + 1;
		fs.writeFileSync(filePath, JSON.stringify(appJson, null, 2) + "\n", "utf-8");

		console.log("Version numbers incremented successfully.");
		console.log(`::set-output name=new_ios_build_number::${newBuildNumber}`);