From 6f14f6aec4dfe646e1e16db34803da1c46577a90 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Sat, 6 Nov 2021 11:38:20 +0100 Subject: Move to Github --- .github/workflows/build-kdoc.yml | 29 ++++++++++++++++++ .github/workflows/test-dev.yml | 63 ++++++++++++++++++++++++++++++++++++++++ .gitlab-ci.yml | 29 ------------------ README.md | 22 +++++--------- 4 files changed, 99 insertions(+), 44 deletions(-) create mode 100644 .github/workflows/build-kdoc.yml create mode 100644 .github/workflows/test-dev.yml delete mode 100644 .gitlab-ci.yml diff --git a/.github/workflows/build-kdoc.yml b/.github/workflows/build-kdoc.yml new file mode 100644 index 0000000..ceecf6f --- /dev/null +++ b/.github/workflows/build-kdoc.yml @@ -0,0 +1,29 @@ +name: Build KDoc +on: + push: + branches: [main] +jobs: + build: + name: Build and publish KDoc + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - uses: actions/setup-java@v2 + with: + distribution: 'temurin' + java-version: 11 + cache: 'gradle' + - uses: gradle/wrapper-validation-action@v1 + + - name: Build KDoc + run: ./gradlew dokkaHtml + - name: Publish KDoc + if: success() + uses: crazy-max/ghaction-github-pages@v2.5.0 + with: + target_branch: gh-pages + build_dir: build/dokka/html + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test-dev.yml b/.github/workflows/test-dev.yml new file mode 100644 index 0000000..4a3b070 --- /dev/null +++ b/.github/workflows/test-dev.yml @@ -0,0 +1,63 @@ +name: Development tests +on: push +jobs: + test: + name: Tests without emulator + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - uses: actions/setup-java@v2 + with: + distribution: 'temurin' + java-version: 11 + cache: 'gradle' + - uses: gradle/wrapper-validation-action@v1 + + - name: Run lint + run: ./gradlew lintDebug + - name: Run unit tests + run: ./gradlew testDebugUnitTest + - name: Archive results + uses: actions/upload-artifact@v2 + with: + name: test-results + path: | + build/outputs/lint* + build/reports + + test_on_emulator: + name: Tests with emulator + runs-on: privileged + container: + image: ghcr.io/bitfireat/docker-android-ci:main + options: --privileged + env: + ANDROID_HOME: /sdk + ANDROID_AVD_HOME: /root/.android/avd + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - uses: gradle/wrapper-validation-action@v1 + + - name: Cache gradle dependencies + uses: actions/cache@v2 + with: + key: ${{ runner.os }}-1 + path: | + ~/.gradle/caches + ~/.gradle/wrapper + + - name: Start emulator + run: start-emulator.sh + - name: Run connected tests + run: ./gradlew connectedDebugAndroidTest + - name: Archive results + uses: actions/upload-artifact@v2 + with: + name: test-results + path: | + build/reports + diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index aca2875..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,29 +0,0 @@ -image: registry.gitlab.com/bitfireat/docker-android-emulator:latest - -before_script: - - export GRADLE_USER_HOME=`pwd`/.gradle; chmod +x gradlew - -cache: - paths: - - .gradle/ - -test: - tags: - - privileged - script: - - start-emulator.sh - - ./gradlew check connectedCheck - artifacts: - paths: - - build/outputs/lint-results-debug.html - - build/reports/ - -pages: - script: - - ./gradlew dokkaHtml - - mkdir public && mv build/dokka public - artifacts: - paths: - - public - only: - - master diff --git a/README.md b/README.md index 66e0a35..f696252 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ -[![build status](https://gitlab.com/bitfireAT/cert4android/badges/master/build.svg)](https://gitlab.com/bitfireAT/cert4android/commits/master) +[![Development tests](https://github.com/bitfireAT/cert4android/actions/workflows/test-dev.yml/badge.svg)](https://github.com/bitfireAT/cert4android/actions/workflows/test-dev.yml) +[![Documentation](https://img.shields.io/badge/documentation-kdoc-brightgreen)](https://bitfireat.github.io/cert4android/) # cert4android @@ -11,9 +12,11 @@ it in your own open-source app. _This software is not affiliated to, nor has it been authorized, sponsored or otherwise approved by Google LLC. Android is a trademark of Google LLC._ -Generated KDoc: https://bitfireat.gitlab.io/cert4android/dokka/html/ +Generated KDoc: https://bitfireat.github.io/cert4android/ -Discussion: https://forums.bitfire.at/category/18/libraries +For questions, suggestions etc. use [Github discussions](https://github.com/bitfireAT/cert4android/discussions). +We're happy about contributions! In case of bigger changes, please let us know in the discussions before. +Then make the changes in your own repository and send a pull request. # Features @@ -57,20 +60,9 @@ directory. Especially `certificate_notification_connection_security` and `trust_certificate_unknown_certificate_found` should contain your app name. -## Contact - -``` -bitfire web engineering – Stockmann, Hirner GesnbR -Florastraße 27 -2540 Bad Vöslau, AUSTRIA -``` - -Email: [play@bitfire.at](mailto:play@bitfire.at) (do not use this) - - # License -Copyright (C) bitfire web engineering (Ricki Hirner, Bernhard Stockmann). +Copyright (C) Ricki Hirner and [contributors](https://github.com/bitfireAT/cert4android/graphs/contributors). This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under the conditions of the [GNU GPL v3](LICENSE). -- cgit v1.2.3