Update AS image

jeppeman · Jul 2, 2023 · 54c7aac · 54c7aac
1 parent aa9a209
commit 54c7aac
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile
@@ -12,8 +12,8 @@ RUN curl -L --keepalive --output jq.deb http://security.ubuntu.com/ubuntu/pool/u
     && apt install ./jq.deb
 
 # Install Android Studio
-RUN curl -C - -L --progress-bar --output android-studio.tar.gz https://storage.googleapis.com/android-studio-distributions/android-studio-2022.1.1.20-linux.tar.gz \
+RUN curl -C - -L --progress-bar --output android-studio.tar.gz https://storage.googleapis.com/android-studio-distributions/android-studio-2022.2.1.20-linux.tar.gz \
     && tar -xvf android-studio.tar.gz -C opt \
     && rm android-studio.tar.gz
 
-ENV ANDROID_STUDIO_PATH /opt/android-studio
+ENV ANDROID_STUDIO_PATH /opt/android-studio
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -74,7 +74,7 @@ jobs:
   server_tests:
     name: Run server lib tests
     runs-on: ubuntu-latest
-    container: fabernovel/android:api-29-v1.1.0
+    container: fabernovel/android:api-33-v1.7.0
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -87,10 +87,19 @@ jobs:
         working-directory: globallydynamic-server-lib
         run: ./gradlew test
 
+      - name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        working-directory: globallydynamic-server-lib
+        if: always()
+        with:
+          files: |
+            */build/reports/**/*.xml
+            */build/reports/**/*.html
+
   gradle_tests:
     name: Run gradle plugin tests
     runs-on: ubuntu-latest
-    container: jeppeman/globallydynamic-studio:as-2020.3.1.22
+    container: jeppeman/globallydynamic-studio:as-2022.2.1.20
     env:
       ANDROID_SDK_ROOT: /opt/android/sdk
       JAVA_HOME: /opt/android-studio/jre
@@ -109,7 +118,7 @@ jobs:
   build_studio_plugin:
     name: Build studio plugin
     runs-on: ubuntu-latest
-    container: jeppeman/globallydynamic-studio:as-2022.1.1.20
+    container: jeppeman/globallydynamic-studio:as-2022.2.1.20
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -125,7 +134,7 @@ jobs:
   studio_tests:
     name: Run studio plugin tests
     runs-on: ubuntu-latest
-    container: jeppeman/globallydynamic-studio:as-2022.1.1.20
+    container: jeppeman/globallydynamic-studio:as-2022.2.1.20
     steps:
       - name: Checkout
         uses: actions/checkout@v2