This commit is contained in:
Michael Droettboom 2019-05-30 10:49:05 -04:00 коммит произвёл GitHub
Родитель 93736f8598
Коммит b5c24899bd
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 29 добавлений и 10 удалений

Просмотреть файл

@ -58,7 +58,7 @@ commands:
rustup target add i686-linux-android
rustup target add x86_64-linux-android
android-tests:
android-setup:
steps:
- install-rustup
- test-setup:
@ -67,9 +67,6 @@ commands:
name: Install missing Android SDK
command: |
sdkmanager 'build-tools;21.0.0'
- run:
name: Gradle Test
command: ./gradlew test
jobs:
Check Rust formatting:
@ -126,10 +123,13 @@ jobs:
docker:
- image: circleci/android:api-28-ndk
steps:
- android-tests
- android-setup
- run:
name: Android tests
command: ./gradlew test
# via https://circleci.com/blog/deploying-documentation-to-github-pages-with-continuous-integration/
Generate documentation:
Generate Rust documentation:
docker:
- image: circleci/rust:latest
steps:
@ -144,12 +144,24 @@ jobs:
tar -xvf mdbook-v0.2.1-x86_64-unknown-linux-gnu.tar.gz
mv mdbook /usr/local/cargo/bin/mdbook
- run:
name: Build documentation
name: Build Rust documentation
command: bin/build-docs.sh
- persist_to_workspace:
root: build/
paths: docs
Generate Kotlin documentation:
docker:
- image: circleci/android:api-28-ndk
steps:
- android-setup
- run:
name: Build Kotlin documentation
command: ./gradlew docs
- persist_to_workspace:
root: build/
paths: docs/javadoc
docs-deploy:
docker:
- image: node:8.10.0
@ -192,10 +204,12 @@ workflows:
- C tests
documentation:
jobs:
- Generate documentation
- Generate Rust documentation
- Generate Kotlin documentation
- docs-deploy:
requires:
- Generate documentation
- Generate Rust documentation
- Generate Kotlin documentation
filters:
branches:
only: master

Просмотреть файл

@ -26,3 +26,4 @@
- [Labeled Metrics](user/metrics/labeled_metric.md)
- [Pings](user/pings/index.md)
- [Baseline Ping](user/pings/baseline.md)
- [API Documentation](api/index.md)

4
docs/api/index.md Normal file
Просмотреть файл

@ -0,0 +1,4 @@
The following language-specific API docs are available:
- [Kotlin API docs](../../javadoc/glean/index.html)
- [Rust core (internal) API docs](../../docs/index.html)

Просмотреть файл

@ -184,7 +184,7 @@ ext.configurePublish(
task docs(type: org.jetbrains.dokka.gradle.DokkaAndroidTask, overwrite: true) {
moduleName = "$rootProject.name"
outputDirectory = "$buildDir/javadoc"
outputDirectory = "$buildDir/../../../build/docs/javadoc"
outputFormat = "html"
jdkVersion = 7
}