From d54cefda5c8c9e0760bd570e08ec323a65bebdf1 Mon Sep 17 00:00:00 2001 From: manas-yu Date: Wed, 18 Dec 2024 11:49:25 +0530 Subject: [PATCH 1/3] version change --- .github/workflows/build_tests.yml | 10 +++++----- .github/workflows/code_coverage.yml | 8 ++++---- .github/workflows/main.yml | 4 ++-- .github/workflows/static_checks.yml | 2 +- .github/workflows/stats.yml | 2 +- .github/workflows/unit_tests.yml | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index cc05bacff3b..2ceff32af16 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -48,7 +48,7 @@ jobs: # with Bazel since Bazel can share the most recent cache from an unrelated build and still # benefit from incremental build performance (assuming that actions/cache aggressively removes # older caches due to the 5GB cache limit size & Bazel's large cache size). - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: cache with: path: ${{ env.CACHE_DIRECTORY }} @@ -191,7 +191,7 @@ jobs: # with Bazel since Bazel can share the most recent cache from an unrelated build and still # benefit from incremental build performance (assuming that actions/cache aggressively removes # older caches due to the 5GB cache limit size & Bazel's large cache size). - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: cache with: path: ${{ env.CACHE_DIRECTORY }} @@ -325,7 +325,7 @@ jobs: # with Bazel since Bazel can share the most recent cache from an unrelated build and still # benefit from incremental build performance (assuming that actions/cache aggressively removes # older caches due to the 5GB cache limit size & Bazel's large cache size). - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: cache with: path: ${{ env.CACHE_DIRECTORY }} @@ -459,7 +459,7 @@ jobs: # with Bazel since Bazel can share the most recent cache from an unrelated build and still # benefit from incremental build performance (assuming that actions/cache aggressively removes # older caches due to the 5GB cache limit size & Bazel's large cache size). - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: cache with: path: ${{ env.CACHE_DIRECTORY }} @@ -580,7 +580,7 @@ jobs: # with Bazel since Bazel can share the most recent cache from an unrelated build and still # benefit from incremental build performance (assuming that actions/cache aggressively removes # older caches due to the 5GB cache limit size & Bazel's large cache size). - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: cache with: path: ${{ env.CACHE_DIRECTORY }} diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 276f2841312..a3807258644 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -45,7 +45,7 @@ jobs: with: version: 6.5.0 - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: scripts_cache with: path: ${{ env.CACHE_DIRECTORY }} @@ -130,7 +130,7 @@ jobs: with: version: 6.5.0 - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: scripts_cache with: path: ${{ env.CACHE_DIRECTORY }} @@ -178,7 +178,7 @@ jobs: # with Bazel since Bazel can share the most recent cache from an unrelated build and still # benefit from incremental build performance (assuming that actions/cache aggressively removes # older caches due to the 5GB cache limit size & Bazel's large cache size). - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: test_cache with: path: ${{ env.CACHE_DIRECTORY }} @@ -285,7 +285,7 @@ jobs: with: version: 6.5.0 - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: scripts_cache with: path: ${{ env.CACHE_DIRECTORY }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f5ba874970e..ee58fb4c444 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: os: [ubuntu-20.04] steps: - uses: actions/checkout@v2 - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: cache with: path: ~/.gradle @@ -119,7 +119,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-jars-{{ checksum "build.gradle" }} diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml index ae04da9c0f4..a943076f7f6 100644 --- a/.github/workflows/static_checks.yml +++ b/.github/workflows/static_checks.yml @@ -115,7 +115,7 @@ jobs: with: version: 6.5.0 - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: scripts_cache with: path: ${{ env.CACHE_DIRECTORY }} diff --git a/.github/workflows/stats.yml b/.github/workflows/stats.yml index bdcb532c03e..f4c0f561c48 100644 --- a/.github/workflows/stats.yml +++ b/.github/workflows/stats.yml @@ -126,7 +126,7 @@ jobs: # with Bazel since Bazel can share the most recent cache from an unrelated build and still # benefit from incremental build performance (assuming that actions/cache aggressively removes # older caches due to the 5GB cache limit size & Bazel's large cache size). - - uses: actions/cache@v2 + - uses: actions/cache@v4 if: ${{ steps.track_commits.outputs.new_commits == 'true' }} id: cache with: diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 82833edfede..0ae969fd9f8 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -35,7 +35,7 @@ jobs: with: version: 6.5.0 - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: scripts_cache with: path: ${{ env.CACHE_DIRECTORY }} @@ -121,7 +121,7 @@ jobs: with: version: 6.5.0 - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: scripts_cache with: path: ${{ env.CACHE_DIRECTORY }} @@ -163,7 +163,7 @@ jobs: # with Bazel since Bazel can share the most recent cache from an unrelated build and still # benefit from incremental build performance (assuming that actions/cache aggressively removes # older caches due to the 5GB cache limit size & Bazel's large cache size). - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: test_cache with: path: ${{ env.CACHE_DIRECTORY }} From 2143aab5060ed5b197a7cb1eb6669b5cc464d9c7 Mon Sep 17 00:00:00 2001 From: manas-yu Date: Wed, 18 Dec 2024 12:39:01 +0530 Subject: [PATCH 2/3] test --- .../oppia/android/util/parser/html/CustomHtmlContentHandler.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/utility/src/main/java/org/oppia/android/util/parser/html/CustomHtmlContentHandler.kt b/utility/src/main/java/org/oppia/android/util/parser/html/CustomHtmlContentHandler.kt index f07310b7a9e..3c3c5d6540d 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/html/CustomHtmlContentHandler.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/html/CustomHtmlContentHandler.kt @@ -47,6 +47,7 @@ class CustomHtmlContentHandler private constructor( originalContentHandler?.characters(ch, start, length) } + override fun endDocument() { originalContentHandler?.endDocument() originalContentHandler = null // There's nothing left to read. From fded102912709fd86246adcb4c426284ae2dfdb2 Mon Sep 17 00:00:00 2001 From: manas-yu Date: Wed, 18 Dec 2024 12:40:14 +0530 Subject: [PATCH 3/3] testing pr pushes --- .github/workflows/wiki.yml | 1 + .../oppia/android/util/parser/html/CustomHtmlContentHandler.kt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml index 57f63fe6fb7..5816c9a7e9a 100644 --- a/.github/workflows/wiki.yml +++ b/.github/workflows/wiki.yml @@ -1,4 +1,5 @@ name: Deploy to Wiki + on: pull_request: paths: diff --git a/utility/src/main/java/org/oppia/android/util/parser/html/CustomHtmlContentHandler.kt b/utility/src/main/java/org/oppia/android/util/parser/html/CustomHtmlContentHandler.kt index 3c3c5d6540d..f07310b7a9e 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/html/CustomHtmlContentHandler.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/html/CustomHtmlContentHandler.kt @@ -47,7 +47,6 @@ class CustomHtmlContentHandler private constructor( originalContentHandler?.characters(ch, start, length) } - override fun endDocument() { originalContentHandler?.endDocument() originalContentHandler = null // There's nothing left to read.