From a24e6fff021ab0b3857d924375629289461e883b Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Thu, 2 May 2024 13:25:34 +0200 Subject: [PATCH 1/4] use libzim 9.2.1 --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index 54ca99b..2f4caf6 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -24,7 +24,7 @@ ext { // Replace these versions with the latest available versions of libkiwix and libzim ext.libkiwix_version = "13.1.0-1" -ext.libzim_version = "9.2.0" +ext.libzim_version = "9.2.1" apply from: 'publish.gradle' android { From 5396f361f84331d6486d53a034da06bd786badf6 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Thu, 2 May 2024 15:48:24 +0200 Subject: [PATCH 2/4] Update workflow actions --- .github/workflows/cd.yml | 4 ++-- .github/workflows/ci.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 286ad97..bf1e686 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -10,10 +10,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: adopt java-version: 11 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20c66b9..cc2c449 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,10 +13,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: adopt java-version: 11 @@ -31,10 +31,10 @@ jobs: run: ./gradlew createCodeCoverageReport - name: Upload code coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 - name: Upload Coverage to GH-Actions - uses: actions/upload-artifact@v2.2.0 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: Tests Coverage Report From 33044e4dea9a95457679135a0fbdb01f07e4a205 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Thu, 2 May 2024 17:02:11 +0200 Subject: [PATCH 3/4] Fix error message --- lib/src/test/test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/test/test.java b/lib/src/test/test.java index ce41834..25a4df7 100644 --- a/lib/src/test/test.java +++ b/lib/src/test/test.java @@ -234,9 +234,9 @@ public void testNonExistant() { String zimFile = "non_existant.zim"; try { TestArchive archive1 = new TestArchive(zimFile); - fail("ERROR: Archive created with invalid Zim file!"); + fail("ERROR: Archive created with invalid ZIM file!"); } catch (Exception e) { - assertEquals("error 2 opening file \"" + zimFile + "\"", e.getMessage()); + assertEquals("Error opening as a split file: " + zimFile, e.getMessage()); } } From 7391792435264b59228ad94684b95165916b3ec6 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Thu, 2 May 2024 17:20:26 +0200 Subject: [PATCH 4/4] Add CODECOV_TOKEN usage --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc2c449..114cca0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,6 +32,8 @@ jobs: - name: Upload code coverage to Codecov uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} - name: Upload Coverage to GH-Actions uses: actions/upload-artifact@v4