let's try again

2023-04-23 14:22:37 +03:00 · 2023-04-23 14:22:37 +03:00 · 38338ae551
parent dbb72ff6c1
commit 38338ae551
1 changed files with 42 additions and 41 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -51,6 +51,48 @@ matrix:
  fast_finish: true

 for:
+  -
+    matrix:
+      only:
+        - appveyor_build_worker_image: Ubuntu
+          job_name: android
+
+    install:
+      - sudo apt-get update && sudo apt-get -y install libasound2-dev libudev-dev libgl1-mesa-dev pkg-config
+      - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -yv --default-toolchain $channel --default-host $target
+      - export PATH=$PATH:$HOME/.cargo/bin
+      - rustup update
+      - rustup default $channel
+      - rustup target add $extra_targets
+      - rustc -vV
+      - cargo -vV
+      - java --version
+
+    cache:
+      - '$HOME/.cache'
+      - '$HOME/.cargo/bin'
+      - '$HOME/.cargo/registry/index'
+      - '$HOME/.cargo/registry/cache'
+      - '$HOME/.cargo/git/db'
+      - '$HOME/.gradle/caches'
+      - '$HOME/.gradle/wrapper'
+      - '$HOME/.rustup'
+      - 'app/app/.cxx'
+      - 'app/app/build/intermediates'
+      - 'app/app/build/outputs/'
+      - 'app/build'
+      - 'drsandroid/target/aarch64-linux-android'
+
+    build_script:
+      #- export DRS_BUILD_VERSION_OVERRIDE=$APPVEYOR_BUILD_VERSION
+      - if [ "$APPVEYOR_REPO_TAG" = "true" ]; then export DRS_BUILD_VERSION_OVERRIDE=$APPVEYOR_REPO_TAG_NAME; else export DRS_BUILD_VERSION_OVERRIDE=$APPVEYOR_BUILD_VERSION; fi
+      - cd app
+      - ./gradlew assembleRelease
+      - mkdir ../release
+      - cd ..
+      - cp app/app/build/outputs/apk/release/app-release.apk release/doukutsu-rs_$target_name.apk
+      - appveyor PushArtifact release/doukutsu-rs_$target_name.apk
+
  -
    matrix:
      only:
@ -163,44 +205,3 @@ for:
      - 7z a ../doukutsu-rs_$target_name.zip *
      - appveyor PushArtifact ../doukutsu-rs_$target_name.zip

-  -
-    matrix:
-      only:
-        - appveyor_build_worker_image: Ubuntu
-          job_name: android
-
-    install:
-      - sudo apt-get update && sudo apt-get -y install libasound2-dev libudev-dev libgl1-mesa-dev pkg-config
-      - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -yv --default-toolchain $channel --default-host $target
-      - export PATH=$PATH:$HOME/.cargo/bin
-      - rustup update
-      - rustup default $channel
-      - rustup target add $extra_targets
-      - rustc -vV
-      - cargo -vV
-      - java --version
-
-    cache:
-      - '$HOME/.cache'
-      - '$HOME/.cargo/bin'
-      - '$HOME/.cargo/registry/index'
-      - '$HOME/.cargo/registry/cache'
-      - '$HOME/.cargo/git/db'
-      - '$HOME/.gradle/caches'
-      - '$HOME/.gradle/wrapper'
-      - '$HOME/.rustup'
-      - 'app/app/.cxx'
-      - 'app/app/build/intermediates'
-      - 'app/app/build/outputs/'
-      - 'app/build'
-      - 'drsandroid/target/aarch64-linux-android'
-
-    build_script:
-      #- export DRS_BUILD_VERSION_OVERRIDE=$APPVEYOR_BUILD_VERSION
-      - if [ "$APPVEYOR_REPO_TAG" = "true" ]; then export DRS_BUILD_VERSION_OVERRIDE=$APPVEYOR_REPO_TAG_NAME; else export DRS_BUILD_VERSION_OVERRIDE=$APPVEYOR_BUILD_VERSION; fi
-      - cd app
-      - ./gradlew assembleRelease
-      - mkdir ../release
-      - cd ..
-      - cp app/app/build/outputs/apk/release/app-release.apk release/doukutsu-rs_$target_name.apk
-      - appveyor PushArtifact release/doukutsu-rs_$target_name.apk