Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relocate documentation #2266

Merged
merged 1 commit into from Mar 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build_doc.yml
Expand Up @@ -24,10 +24,10 @@ jobs:
working-directory: arrow-libs
run: ./gradlew dokka
- name: Validate documentation
working-directory: arrow-docs
working-directory: arrow-site
run: ./gradlew runAnk
- name: Build site
working-directory: arrow-site
run: |
bundle install --gemfile Gemfile --path vendor/bundle
bundle exec jekyll build -s docs
bundle exec jekyll build -s build/site
8 changes: 4 additions & 4 deletions .github/workflows/publish_doc.yml
Expand Up @@ -47,13 +47,13 @@ jobs:
working-directory: arrow-libs
run: ./gradlew dokka
- name: "Validate documentation"
working-directory: arrow-docs
working-directory: arrow-site
run: ./gradlew runAnk
- name: "Latest release: build (landing page + docs/)"
if: steps.versions.outputs.new-release-version-exists == '1'
working-directory: arrow-site
run: |
bundle exec jekyll build -b docs -s docs
bundle exec jekyll build -b docs -s build/site
tree _site > $BASEDIR/logs/content_docs.log
- name: "Latest release: publish (landing page + docs/)"
if: steps.versions.outputs.new-release-version-exists == '1'
Expand All @@ -69,7 +69,7 @@ jobs:
working-directory: arrow-site
run: |
SHORT_VERSION=$(echo ${{ steps.versions.outputs.release-version }} | cut -d. -f1-2)
bundle exec jekyll build -b docs/${SHORT_VERSION} -s docs
bundle exec jekyll build -b docs/${SHORT_VERSION} -s build/site
tree _site > $BASEDIR/logs/content_docs-${SHORT_VERSION}.log
- name: "Latest release: publish release directory (docs/<major.minor>)"
if: steps.versions.outputs.new-release-version-exists == '1'
Expand All @@ -85,7 +85,7 @@ jobs:
- name: "Next version: build (/docs/next)"
working-directory: arrow-site
run: |
bundle exec jekyll build -b docs/next -s docs
bundle exec jekyll build -b docs/next -s build/site
tree _site > $BASEDIR/logs/content_docs-next.log
- name: "Next version: publish (/docs/next)"
working-directory: arrow-site
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Expand Up @@ -116,9 +116,6 @@ vendor
# Ruby
Gemfile.lock

# Site
arrow-site/docs

### Intellij Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Expand Up @@ -58,7 +58,7 @@ In order to generate the documentation and validate it:
cd arrow-libs
./gradlew dokka

cd ../arrow-docs
cd ../arrow-site
./gradlew runAnk
```

Expand Down
Empty file.
2 changes: 1 addition & 1 deletion arrow-libs/gradle/apidoc-creation.gradle
Expand Up @@ -19,7 +19,7 @@ apply plugin: "org.jetbrains.dokka"
//dokka log spam `Can't find node by signature` comes from https://github.com/Kotlin/dokka/issues/269
dokka {
outputFormat = 'jekyll'
outputDirectory = "${rootDir}/../arrow-docs/docs/apidocs"
outputDirectory = "${rootDir}/../arrow-site/docs/apidocs"
configuration {
includes = ['README.md']
reportUndocumented = false
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions arrow-docs/build.gradle → arrow-site/build.gradle
Expand Up @@ -37,7 +37,7 @@ dependencies {
apply plugin: 'ank-gradle-plugin'

ank {
source = file("${projectDir}/docs")
target = file("${rootDir}/../arrow-site/docs")
source = file("${rootDir}/docs")
target = file("${rootDir}/build/site")
classpath = sourceSets.main.runtimeClasspath
}
@@ -1,3 +1,6 @@
---
library: core
---
{: data-executable="true"}
```kotlin:ank
import arrow.core.Either
Expand Down
@@ -1,3 +1,6 @@
---
library: fx
---
```kotlin:ank:playground
import arrow.fx.coroutines.parTraverse
import arrow.fx.coroutines.parMapN
Expand All @@ -23,6 +26,8 @@ fun employee(name: String, company: Company): Employee =

suspend fun main() {
//sampleStart


//maps each function to `::employee` in parallel
val audrey = parMapN({ "Audrey" }, { company("Arrow") }, ::employee)
val pepe = parMapN({ "Pepe" }, { company("Arrow") }, ::employee)
Expand Down
@@ -1,5 +1,9 @@
---
library: meta
---
```kotlin
//sampleStart

val Meta.helloWorld: CliPlugin get() =
"Hello World" {
meta(
Expand Down
@@ -1,3 +1,6 @@
---
library: optics
---
{: data-executable="true"}
```kotlin:ank
package example
Expand Down
5 changes: 0 additions & 5 deletions arrow-site/docs/_data/code.yml

This file was deleted.

8 changes: 4 additions & 4 deletions arrow-site/docs/_includes/_header.html
Expand Up @@ -3,15 +3,15 @@
<div class="header-flex">
<div class="header-text">
<h1 id="header-text">{{site.data.commons.description}}</h1>
{% for library in site.data.code.libraries %}
<div id="{{ library }}-code-block" class="browser-content">
{% assign codeCol = site.code %}
{% for code in codeCol %}
<div id="{{code.library}}-code-block" class="browser-content">
<ul class="browser-header">
<li></li>
<li></li>
<li></li>
</ul>
{% capture library_snippet %}{% include_relative landingpage/{{ library }}-home-code.md %}{% endcapture %}
<div class="browser-code">{{ library_snippet | markdownify }}</div>
<div class="browser-code">{{ code }}</div>
</div>
{% endfor %}
</div>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.