CI: add testing on Java 17 and dependabot (#113)

* fix compression tests for jdk17 Co-authored-by: Tobias Roeser <[email protected]> Pull request: #113
com-lihaoyi · Aug 15, 2022 · 6d4a223 · 6d4a223
1 parent ca5d9d0
commit 6d4a223
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -13,21 +13,27 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: ['8', '17']
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          distribution: 'temurin'
+          java-version: ${{ matrix.java }}
       - name: Run tests
         run: ./mill -i all __.publishArtifacts __.test
+
   check-binary-compatibility:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: 8
       - name: Check Binary Compatibility
         run: ./mill -i __.mimaReportBinaryIssues
@@ -45,9 +51,10 @@ jobs:
       LC_MESSAGES: "en_US.UTF-8"
       LC_ALL: "en_US.UTF-8"
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: 8
       - name: Publish to Maven Central
         run: |

diff --git a/requests/test/src/requests/RequestTests.scala b/requests/test/src/requests/RequestTests.scala
@@ -191,16 +191,15 @@ object RequestTests extends TestSuite{
         compress = requests.Compress.Gzip,
         data = new RequestBlob.ByteSourceRequestBlob("I am cow")
       )
-      assert(read(new String(res2.bytes))("data").toString ==
-        """"data:application/octet-stream;base64,H4sIAAAAAAAAAPNUSMxVSM4vBwCAGeD4CAAAAA=="""")
+      assert(read(new String(res2.bytes))("data").toString.contains("data:application/octet-stream;base64,H4sIAAAAAA"))
 
       val res3 = requests.post(
         "https://httpbin.org/post",
         compress = requests.Compress.Deflate,
         data = new RequestBlob.ByteSourceRequestBlob("Hear me moo")
       )
-      assert(read(new String(res2.bytes))("data").toString == 
-        """"data:application/octet-stream;base64,H4sIAAAAAAAAAPNUSMxVSM4vBwCAGeD4CAAAAA=="""")
+      assert(read(new String(res3.bytes))("data").toString == 
+        """"data:application/octet-stream;base64,eJzzSE0sUshNVcjNzwcAFokD3g=="""")
      }
 
     test("headers"){