diff options
author | Andrew Dolgov <[email protected]> | 2023-04-02 10:39:29 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2023-04-02 10:39:29 +0300 |
commit | 81855dbac4f31f4def98ccb88326214dc276a784 (patch) | |
tree | 720f848c7a3eeb4961eba24b9f90f07ad3dcc5c5 | |
parent | dcab924aff10ec414ddaf0a3c10707d0dbb37b7f (diff) |
-rw-r--r-- | .gitea/workflows/build.yml | 40 | ||||
-rw-r--r-- | .gitlab-ci.yml | 46 |
2 files changed, 4 insertions, 82 deletions
diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml deleted file mode 100644 index 9fa42f8..0000000 --- a/.gitea/workflows/build.yml +++ /dev/null @@ -1,40 +0,0 @@ -# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json - -name: build - -on: - push: - branches: - - "master" - -jobs: - build: - runs-on: ubuntu-latest - env: - ANDROID_HOME: /toolcache/android-sdk - FDROID_JKS: /toolcache/android-jks/fdroid.jks - GRADLE_USER_HOME: /toolcache/gradle - steps: - - uses: actions/checkout@v3 - - - name: assemble fdroid - run: | - bash ./gradlew --no-daemon assembleFdroid \ - -PFDROID_STORE_FILE=${FDROID_JKS} \ - -PFDROID_STORE_PASSWORD=${{ secrets.FDROID_STORE_PASSWORD }} \ - -PFDROID_KEY_ALIAS=fdroid \ - -PFDROID_KEY_PASSWORD=${{ secrets.FDROID_KEY_PASSWORD }} - - - name: prepare ssh - run: | - mkdir -p ~/.ssh - echo "${{ secrets.APK_DEPLOY_SSH_KEY }}" | tr -d \\r > ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - - - name: deploy apks - run: | - find . -name '*.apk' -type f | while read APK; do - scp -oStrictHostKeyChecking=no $APK ${{ secrets.APK_DEPLOY_USER }}@${{ secrets.APK_DEPLOY_HOST }}:fdroid/repo/ - done - - ssh -oStrictHostKeyChecking=no ${{ secrets.APK_DEPLOY_USER }}@${{ secrets.APK_DEPLOY_HOST }} sudo -u docker-mgr /usr/local/sbin/fdroid-update-repo diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c556ce..02509fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,42 +1,4 @@ -image: openjdk:8-jdk - -variables: - ANDROID_COMPILE_SDK: "23" - ANDROID_BUILD_TOOLS: "23.0.1" - ANDROID_SDK_TOOLS: "24" - -before_script: - - apt-get --quiet update --yes - - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 - - wget --no-clobber --quiet --output-document=android-sdk-${ANDROID_SDK_TOOLS}.tgz https://dl.google.com/android/android-sdk_r${ANDROID_SDK_TOOLS}-linux.tgz || true - - tar --extract --gzip --file=android-sdk-${ANDROID_SDK_TOOLS}.tgz - - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter android-${ANDROID_COMPILE_SDK} - - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter platform-tools - - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter build-tools-${ANDROID_BUILD_TOOLS} - - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-android-m2repository - - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-google-google_play_services - - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-google-m2repository - - export ANDROID_HOME=$PWD/android-sdk-linux - - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ - - chmod +x ./gradlew - - export GRADLE_USER_HOME=`pwd`/.gradle - - mkdir -p $ANDROID_HOME/licenses/ \ - && echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_HOME/licenses/android-sdk-license - -cache: - paths: - - .gradle/wrapper - - .gradle/caches - - android-sdk-${ANDROID_SDK_TOOLS}.tgz - -stages: - - build - -build: - stage: build - script: - - ./gradlew assembleDebug - artifacts: - paths: - - org.fox.ttcomics/build/outputs/apk/*.apk - +include: + - project: 'ci/ci-templates' + ref: master + file: .ci-build-apk-fdroid.yml |