Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
Sateetas committed Dec 13, 2024
1 parent 6d067ef commit 226bd3e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ concurrency:
jobs:
test:
name: Test
runs-on: [ self-hosted, ARM64, active-android ]
runs-on: [ self-hosted, ARM64, Linux ]
if: github.event.pull_request.draft == false
steps:
# temporary step, will be deleted soon
Expand All @@ -47,6 +47,7 @@ jobs:
BUNDLE_PATH: vendor/bundle
run: |
docker run --rm \
-u ubuntu
-e GITHUB_TOKEN \
-e GITHUB_ACTOR \
-e BUNDLE_PATH \
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ RUN mkdir -p $ANDROID_HOME/cmdline-tools/latest && \

RUN wget https://github.com/lzhiyong/android-sdk-tools/releases/download/34.0.3/android-sdk-tools-static-aarch64.zip -O /tmp/android-sdk-tools-static-aarch64.zip && \
unzip /tmp/android-sdk-tools-static-aarch64.zip -d /tmp/android-sdk-tools-static-arm && \
mkdir $ANDROID_HOME/build-tools/34.0.0_aarch64 && \
cp -r /tmp/android-sdk-tools-static-arm/build-tools/* $ANDROID_HOME/build-tools/34.0.0_aarch64/ && \
cp -r /tmp/android-sdk-tools-static-arm/build-tools/* $ANDROID_HOME/build-tools/34.0.0/ && \
rm -rf /tmp/android-sdk-tools-static-arm /tmp/android-sdk-tools-static-aarch64.zip

RUN gem install bundler:2.5.23
Expand Down
2 changes: 1 addition & 1 deletion ci_resources/build_8gb_ram_ci_gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ org.gradle.caching=false

android.useAndroidX=true
android.nonTransitiveRClass=false
android.aapt2FromMavenOverride=/opt/android-sdk/build-tools/34.0.0_aarch64/aapt2
android.aapt2FromMavenOverride=/opt/android-sdk/build-tools/34.0.0/aapt2

kotlin.incremental=false
kotlin.compiler.execution.strategy=in-process
2 changes: 1 addition & 1 deletion ci_resources/tests_8gb_ram_ci_gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ org.gradle.caching=false

android.useAndroidX=true
android.nonTransitiveRClass=false
android.aapt2FromMavenOverride=/opt/android-sdk/build-tools/34.0.0_aarch64/aapt2
android.aapt2FromMavenOverride=/opt/android-sdk/build-tools/34.0.0/aapt2

kotlin.incremental=false

0 comments on commit 226bd3e

Please sign in to comment.