Fix part of #1861: [RunAllTests] Update Bazel CI workflow to run all Oppia tests

.github/CODEOWNERS

@@ -45,6 +45,10 @@ gradlew.bat @BenHenning
 /.github/*.md @BenHenning
 /.github/ISSUE_TEMPLATE @BenHenning
 
+# Git secret files & related configurations.
+/.gitsecret/ @BenHenning
+*.secret @BenHenning
+
 # CI configuration.
 /.github/workflows/ @BenHenning
 

.github/workflows/main.yml

@@ -17,7 +17,7 @@ on:
 jobs:
   linters:
     name: Lint Tests
-    runs-on:  ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-18.04]
@@ -47,10 +47,10 @@ jobs:
 
   robolectric_tests:
     name: Robolectric Tests (Non-App Modules)
-    runs-on:  ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04] 
+        os: [ubuntu-18.04]
     steps:
      - uses: actions/checkout@v2
      - uses: actions/cache@v2
@@ -104,11 +104,11 @@ jobs:
 
   app_tests:
     name: Robolectric Tests - App Module (Non-Flaky)
-    runs-on:  ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-18.04]
-    steps: 
+    steps:
       - uses: actions/checkout@v2
 
       - uses: actions/cache@v2
@@ -140,33 +140,172 @@ jobs:
         os: [ubuntu-18.04]
     steps:
       - uses: actions/checkout@v2
-      - name: Set up bazel
-        uses: jwlawson/actions-setup-bazel@v1
-        with:
-          bazel-version: '3.4.1'
       - name: Clone Oppia Bazel
         run: git clone https://github.com/oppia/bazel.git $HOME/oppia-bazel
       - name: Set up JDK 9
         uses: actions/setup-java@v1
         with:
           java-version: 9
-      - name: Extract Android Tools
+      - name: Extract Android tools
         run: |
           mkdir -p $GITHUB_WORKSPACE/tmp/android_tools
           cd $HOME/oppia-bazel
           unzip bazel-tools.zip
           tar -xf $HOME/oppia-bazel/android_tools.tar.gz -C $GITHUB_WORKSPACE/tmp/android_tools
-      - name: Unzip Bazel Binary and Build Oppia
+      # See https://git-secret.io/installation for details on installing git-secret. Note that the
+      # apt-get method isn't used since it's much slower to update & upgrade apt before installation
+      # versus just directly cloning & installing the project. Further, the specific version
+      # shouldn't matter since git-secret relies on a future-proof storage mechanism for secrets.
+      # This also uses a different directory to install git-secret to avoid requiring root access
+      # when running the git secret command.
+      - name: Install git-secret (non-fork only)
+        if: github.repository == 'oppia/oppia-android'
+        shell: bash
+        run: |
+          cd $HOME
+          mkdir -p $HOME/gitsecret
+          git clone https://github.com/sobolevn/git-secret.git git-secret
+          cd git-secret && make build
+          PREFIX="$HOME/gitsecret" make install
+          echo "$HOME/gitsecret" >> $GITHUB_PATH
+          echo "$HOME/gitsecret/bin" >> $GITHUB_PATH
+      - name: Decrypt secrets (non-fork only)
+        if: github.repository == 'oppia/oppia-android'
+        env:
+          GIT_SECRET_GPG_PRIVATE_KEY: ${{ secrets.GIT_SECRET_GPG_PRIVATE_KEY }}
+        run: |
+          cd $HOME
+          # NOTE TO DEVELOPERS: Make sure to never print this key directly to stdout!
+          echo $GIT_SECRET_GPG_PRIVATE_KEY | base64 --decode > ./git_secret_private_key.gpg
+          gpg --import ./git_secret_private_key.gpg
+          cd $GITHUB_WORKSPACE
+          git secret reveal
+      - name: Unzip Bazel binary
         run: |
           cd $HOME/oppia-bazel
           unzip bazel-build.zip
           cd $GITHUB_WORKSPACE
           chmod a+x $HOME/oppia-bazel/bazel
-          $HOME/oppia-bazel/bazel build //:oppia --android_databinding_use_v3_4_args --experimental_android_databinding_v2 --override_repository=android_tools=$GITHUB_WORKSPACE/tmp/android_tools --java_header_compilation=false --noincremental_dexing --define=android_standalone_dexing_tool=d8_compat_dx
-          cp $GITHUB_WORKSPACE/bazel-bin/oppia.apk /home/runner/work/oppia-android/oppia-android/
+      # Note that caching only works on non-forks.
+      - name: Build Oppia binary (with caching, non-fork only)
+        if: github.repository == 'oppia/oppia-android'
+        env:
+          BAZEL_REMOTE_CACHE_URL: ${{ secrets.BAZEL_REMOTE_CACHE_URL }}
+        run: |
+          $HOME/oppia-bazel/bazel build --override_repository=android_tools=$GITHUB_WORKSPACE/tmp/android_tools --remote_http_cache=$BAZEL_REMOTE_CACHE_URL --google_credentials=./config/oppia-dev-workflow-remote-cache-credentials.json -- //:oppia
+      - name: Build Oppia binary (without caching, fork only)
+        if: github.repository != 'oppia/oppia-android'
+        run: |
+          $HOME/oppia-bazel/bazel build --override_repository=android_tools=$GITHUB_WORKSPACE/tmp/android_tools -- //:oppia
+      - name: Copy Oppia APK for uploading
+        run: cp $GITHUB_WORKSPACE/bazel-bin/oppia.apk /home/runner/work/oppia-android/oppia-android/
       - uses: actions/upload-artifact@v2
         with:
           name: oppia-bazel-apk
           path: /home/runner/work/oppia-android/oppia-android/oppia.apk
+
+  bazel_compute_affected_targets:
+    name: Compute affected tests
+    runs-on: ubuntu-18.04
+    outputs:
+      matrix: ${{ steps.compute-test-matrix-from-affected.outputs.matrix || steps.compute-test-matrix-from-all.outputs.matrix }}
+    steps:
       - uses: actions/checkout@v2
-
+        with:
+          fetch-depth: 0
+      - name: Clone Oppia Bazel
+        run: git clone https://github.com/oppia/bazel.git $HOME/oppia-bazel
+      - name: Unzip Bazel binary
+        run: |
+          cd $HOME/oppia-bazel
+          unzip bazel-build.zip
+          cd $GITHUB_WORKSPACE
+          chmod a+x $HOME/oppia-bazel/bazel
+      - name: Compute test matrix based on affected targets
+        id: compute-test-matrix-from-affected
+        if: "!contains(github.event.pull_request.title, '[RunAllTests]')"
+        # https://unix.stackexchange.com/a/338124 for reference on creating a JSON-friendly
+        # comma-separated list of test targets for the matrix.
+        run: |
+          TEST_TARGET_LIST=$(bash ./scripts/compute_affected_tests.sh $HOME/oppia-bazel/bazel | sed 's/^\|$/"/g' | paste -sd, -)
+          echo "Affected tests (note that this might be all tests if on the develop branch): $TEST_TARGET_LIST"
+          echo "::set-output name=matrix::{\"test-target\":[$TEST_TARGET_LIST]}"
+      - name: Compute test matrix based on all tests
+        id: compute-test-matrix-from-all
+        if: "contains(github.event.pull_request.title, '[RunAllTests]')"
+        run: |
+          TEST_TARGET_LIST=$($HOME/oppia-bazel/bazel query "kind(test, //...)" | sed 's/^\|$/"/g' | paste -sd, -)
+          echo "Affected tests (note that this might be all tests if on the develop branch): $TEST_TARGET_LIST"
+          echo "::set-output name=matrix::{\"test-target\":[$TEST_TARGET_LIST]}"
+
+  bazel_run_test:
+    name: Run Bazel Test
+    needs: bazel_compute_affected_targets
+    runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.bazel_compute_affected_targets.outputs.matrix)}}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Clone Oppia Bazel
+        run: git clone https://github.com/oppia/bazel.git $HOME/oppia-bazel
+      - name: Set up JDK 9
+        uses: actions/setup-java@v1
+        with:
+          java-version: 9
+      - name: Extract Android tools
+        run: |
+          mkdir -p $GITHUB_WORKSPACE/tmp/android_tools
+          cd $HOME/oppia-bazel
+          unzip bazel-tools.zip
+          tar -xf $HOME/oppia-bazel/android_tools.tar.gz -C $GITHUB_WORKSPACE/tmp/android_tools
+      # See explanation in bazel_build_app for how this is installed.
+      - name: Install git-secret (non-fork only)
+        if: github.repository == 'oppia/oppia-android'
+        shell: bash
+        run: |
+          cd $HOME
+          mkdir -p $HOME/gitsecret
+          git clone https://github.com/sobolevn/git-secret.git git-secret
+          cd git-secret && make build
+          PREFIX="$HOME/gitsecret" make install
+          echo "$HOME/gitsecret" >> $GITHUB_PATH
+          echo "$HOME/gitsecret/bin" >> $GITHUB_PATH
+      - name: Decrypt secrets (non-fork only)
+        if: github.repository == 'oppia/oppia-android'
+        env:
+          GIT_SECRET_GPG_PRIVATE_KEY: ${{ secrets.GIT_SECRET_GPG_PRIVATE_KEY }}
+        run: |
+          cd $HOME
+          # NOTE TO DEVELOPERS: Make sure to never print this key directly to stdout!
+          echo $GIT_SECRET_GPG_PRIVATE_KEY | base64 --decode > ./git_secret_private_key.gpg
+          gpg --import ./git_secret_private_key.gpg
+          cd $GITHUB_WORKSPACE
+          git secret reveal
+      - name: Unzip Bazel binary
+        run: |
+          cd $HOME/oppia-bazel
+          unzip bazel-build.zip
+          cd $GITHUB_WORKSPACE
+          chmod a+x $HOME/oppia-bazel/bazel
+      - name: Run Oppia Test (with caching, non-fork only)
+        if: github.repository == 'oppia/oppia-android'
+        env:
+          BAZEL_REMOTE_CACHE_URL: ${{ secrets.BAZEL_REMOTE_CACHE_URL }}
+        run: $HOME/oppia-bazel/bazel test --override_repository=android_tools=$GITHUB_WORKSPACE/tmp/android_tools --remote_http_cache=$BAZEL_REMOTE_CACHE_URL --google_credentials=./config/oppia-dev-workflow-remote-cache-credentials.json -- ${{ matrix.test-target }}
+      - name: Run Oppia Test (without caching, fork only)
+        if: github.repository != 'oppia/oppia-android'
+        env:
+          BAZEL_REMOTE_CACHE_URL: ${{ secrets.BAZEL_REMOTE_CACHE_URL }}
+        run: $HOME/oppia-bazel/bazel test --override_repository=android_tools=$GITHUB_WORKSPACE/tmp/android_tools -- ${{ matrix.test-target }}
+
+  # Reference: https://github.community/t/127354/7.
+  check_test_results:
+      name: Check Bazel Test Results
+      needs: bazel_run_test
+      if: ${{ always() }}
+      runs-on: ubuntu-18.04
+      steps:
+        - name: Check tests passed
+          if: ${{ needs.bazel_run_test.result != 'success' }}
+          run: exit 1

.github/workflows/workflow_canceller.yml

@@ -0,0 +1,28 @@
+name: Automatic Workflow Canceller
+
+# This workflow should be triggered in one of three situations:
+# 1. Manual workflow dispatch via https://github.com/oppia/oppia-android/actions.
+# 2. Upon creation of a PR & updates to that PR.
+# 3. Whenever the develop branch is changed (e.g. after a PR is merged).
+#
+# Note that the action being used here automatically accounts for the current branch & the commit
+# hash of the tip of the branch to ensure it doesn't cancel previous workflows that aren't related
+# to the branch being evaluated.
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      # Push events on develop branch
+      - develop
+
+jobs:
+  cancel:
+    name: Cancel Previous Runs
+    runs-on: ubuntu-18.04
+    steps:
+      # See https://github.com/styfle/cancel-workflow-action for details on this workflow.
+      - uses: styfle/[email protected]
+        with:
+          workflow_id: main.yml
+          access_token: ${{ github.token }}

.gitignore

@@ -24,3 +24,8 @@ utility/build
 gradle
 gradlew
 gradlew.bat
+.gitsecret/keys/random_seed
+!*.secret
+config/oppia-dev-workflow-remote-cache-credentials.json
+bazel-*
+.bazelproject

.gitsecret/paths/mapping.cfg

@@ -0,0 +1 @@
+config/oppia-dev-workflow-remote-cache-credentials.json:c02f95d3829f9a7fb3757170ade432efa43d562d2e7c208372ec9d0f4a45da1a

app/src/main/res/layout-land/submitted_answer_item.xml

@@ -20,6 +20,7 @@
   </data>
 
   <androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/submitted_answer_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"

app/src/main/res/layout/submitted_answer_item.xml

@@ -26,6 +26,7 @@
   </data>
 
   <androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/submitted_answer_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"

app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt

@@ -551,6 +551,7 @@ class StateFragmentTest {
   }
 
   @Test
+  @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   fun testStateFragment_loadImageRegion_clickRegion6_submitButtonClickable() {
     launchForExploration(TEST_EXPLORATION_ID_5).use {
       startPlayingExploration()
@@ -564,6 +565,7 @@ class StateFragmentTest {
   }
 
   @Test
+  @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   fun testStateFragment_loadImageRegion_clickRegion6_clickSubmit_receivesCorrectFeedback() {
     launchForExploration(TEST_EXPLORATION_ID_5).use {
       startPlayingExploration()
@@ -582,6 +584,7 @@ class StateFragmentTest {
   }
 
   @Test
+  @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   fun testStateFragment_loadImageRegion_submitButtonDisabled() {
     launchForExploration(TEST_EXPLORATION_ID_5).use {
       startPlayingExploration()
@@ -595,7 +598,7 @@ class StateFragmentTest {
 
   @Test
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
-  fun loadImageRegion_defaultRegionClick_defaultRegionClicked_submitButtonDisabled() {
+  fun testStateFragment_loadImageRegion_defaultRegionClick_defRegionClicked_submitButtonDisabled() {
     launchForExploration(TEST_EXPLORATION_ID_5).use {
       startPlayingExploration()
       waitForImageViewInteractionToFullyLoad()
@@ -608,6 +611,7 @@ class StateFragmentTest {
   }
 
   @Test
+  @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   fun testStateFragment_loadImageRegion_clickedRegion6_region6Clicked_submitButtonEnabled() {
     launchForExploration(TEST_EXPLORATION_ID_5).use {
       startPlayingExploration()
@@ -621,6 +625,7 @@ class StateFragmentTest {
   }
 
   @Test
+  @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   fun testStateFragment_loadImageRegion_clickedRegion6_region6Clicked_correctFeedback() {
     launchForExploration(TEST_EXPLORATION_ID_5).use {
       startPlayingExploration()
@@ -639,6 +644,7 @@ class StateFragmentTest {
   }
 
   @Test
+  @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   fun testStateFragment_loadImageRegion_clickedRegion6_region6Clicked_correctAnswer() {
     launchForExploration(TEST_EXPLORATION_ID_5).use {
       startPlayingExploration()
@@ -657,6 +663,7 @@ class StateFragmentTest {
   }
 
   @Test
+  @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   fun testStateFragment_loadImageRegion_clickedRegion6_region6Clicked_continueButtonIsDisplayed() {
     launchForExploration(TEST_EXPLORATION_ID_5).use {
       startPlayingExploration()
@@ -671,7 +678,8 @@ class StateFragmentTest {
   }
 
   @Test
-  fun loadImageRegion_clickRegion6_clickedRegion5_region5Clicked_correctFeedback() {
+  @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
+  fun testStateFragment_loadImageRegion_clickRegion6_clickedRegion5_clickRegion5_correctFeedback() {
     launchForExploration(TEST_EXPLORATION_ID_5).use {
       startPlayingExploration()
       waitForImageViewInteractionToFullyLoad()