From 78789ff5ac830930c871c310b3bb0efa97b6aa0c Mon Sep 17 00:00:00 2001
From: thisjustin123 <jjg283@cornell.edu>
Date: Thu, 3 Oct 2024 14:21:48 -0400
Subject: [PATCH 1/3] Add beta and whatsnew

---
 .../workflows/publish-to-play-store-beta.yml  | 68 +++++++++++++++++++
 whatsnew/whatsnew-en-US                       |  1 +
 2 files changed, 69 insertions(+)
 create mode 100644 .github/workflows/publish-to-play-store-beta.yml
 create mode 100644 whatsnew/whatsnew-en-US

diff --git a/.github/workflows/publish-to-play-store-beta.yml b/.github/workflows/publish-to-play-store-beta.yml
new file mode 100644
index 00000000..a76e76ae
--- /dev/null
+++ b/.github/workflows/publish-to-play-store-beta.yml
@@ -0,0 +1,68 @@
+name: Publish to Google Play Store Beta
+
+on:
+  push:
+    branches: [ prod-beta ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Build with Gradle
+        id: build
+        run: ./gradlew build
+
+      - name: Build the app
+        id: buildRelease
+        run: ./gradlew bundleRelease
+
+      - name: Sign AAB
+        id: sign
+        uses: r0adkll/sign-android-release@v1
+        with:
+          releaseDirectory: app/build/outputs/bundle/release
+          signingKeyBase64: ${{ secrets.KEYSTORE }}
+          alias: ${{ secrets.KEY_ALIAS }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - name: Upload AAB
+        id: uploadArtifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: app
+          path: app/build/outputs/bundle/release/app-release.aab
+
+      - name: Create service_account.json
+        id: createServiceAccount
+        run: echo '${{ secrets.PLAY_STORE_JSON }}' > service_account.json
+
+      - name: Deploy to Play Store (BETA)
+        id: deploy
+        uses: r0adkll/upload-google-play@v1
+        with:
+          serviceAccountJson: service_account.json
+          packageName: ${{ secrets.PACKAGE_NAME }}
+          releaseFiles: "app/build/outputs/bundle/release/app-release.aab"
+          track: beta
+          whatsNewDirectory: whatsnew/
+
+      - name: Notify on Slack
+        uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+          steps: ${{ toJson(steps) }}
+        if: always()
diff --git a/whatsnew/whatsnew-en-US b/whatsnew/whatsnew-en-US
new file mode 100644
index 00000000..6dbb3c01
--- /dev/null
+++ b/whatsnew/whatsnew-en-US
@@ -0,0 +1 @@
+We're working hard to bring you the latest fixes and features to Eatery!

From c1bdd2720d489f372b6074d409b70285de1abc9d Mon Sep 17 00:00:00 2001
From: thisjustin123 <jjg283@cornell.edu>
Date: Thu, 3 Oct 2024 14:22:39 -0400
Subject: [PATCH 2/3] Add prod push

---
 .github/workflows/publish-to-play-store.yml | 68 +++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 .github/workflows/publish-to-play-store.yml

diff --git a/.github/workflows/publish-to-play-store.yml b/.github/workflows/publish-to-play-store.yml
new file mode 100644
index 00000000..455daa4a
--- /dev/null
+++ b/.github/workflows/publish-to-play-store.yml
@@ -0,0 +1,68 @@
+name: Publish to Google Play Store [PRODUCTION]
+
+on:
+  push:
+    branches: [ prod ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Build with Gradle
+        id: build
+        run: ./gradlew build
+
+      - name: Build the app
+        id: buildRelease
+        run: ./gradlew bundleRelease
+
+      - name: Sign AAB
+        id: sign
+        uses: r0adkll/sign-android-release@v1
+        with:
+          releaseDirectory: app/build/outputs/bundle/release
+          signingKeyBase64: ${{ secrets.KEYSTORE }}
+          alias: ${{ secrets.KEY_ALIAS }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - name: Upload AAB
+        id: uploadArtifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: app
+          path: app/build/outputs/bundle/release/app-release.aab
+
+      - name: Create service_account.json
+        id: createServiceAccount
+        run: echo '${{ secrets.PLAY_STORE_JSON }}' > service_account.json
+
+      - name: Deploy to Play Store (PROD)
+        id: deploy
+        uses: r0adkll/upload-google-play@v1
+        with:
+          serviceAccountJson: service_account.json
+          packageName: ${{ secrets.PACKAGE_NAME }}
+          releaseFiles: "app/build/outputs/bundle/release/app-release.aab"
+          track: production
+          whatsNewDirectory: whatsnew/
+
+      - name: Notify on Slack
+        uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+          steps: ${{ toJson(steps) }}
+        if: always()

From f116645e8fdbd2af6b4e13d7b725f963f43a3e79 Mon Sep 17 00:00:00 2001
From: thisjustin123 <jjg283@cornell.edu>
Date: Thu, 3 Oct 2024 14:30:15 -0400
Subject: [PATCH 3/3] Change description

---
 whatsnew/whatsnew-en-US | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/whatsnew/whatsnew-en-US b/whatsnew/whatsnew-en-US
index 6dbb3c01..25aaf188 100644
--- a/whatsnew/whatsnew-en-US
+++ b/whatsnew/whatsnew-en-US
@@ -1 +1 @@
-We're working hard to bring you the latest fixes and features to Eatery!
+Adds the Compare Menus feature!