Skip to content

Commit

Permalink
TRCKR-T-6 update setup-java action to v4; enable release steps; minor…
Browse files Browse the repository at this point in the history
… refactoring
  • Loading branch information
dzmpr committed Apr 14, 2024
1 parent 57bff2c commit eb335c8
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 29 deletions.
34 changes: 18 additions & 16 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ jobs:
uses: actions/checkout@v4

- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11

# - name: Publish artifacts to maven central
# run: ./gradlew publishAllPublicationsToMavenCentralRepository
# env:
# ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_USER }}
# ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_PASS }}
# ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
# ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASS }}
- name: Publish artifacts to maven central
run: ./gradlew publishAllPublicationsToMavenCentralRepository
env:
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_USER }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_PASS }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASS }}

publish-documentation:
name: Publish documentation
Expand All @@ -40,14 +40,16 @@ jobs:
uses: actions/checkout@v4

- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11

- name: Run dokka
run: |
./gradlew dokkaHtmlMultiModule
# Move dokka documentation to docs/api directory
mv ./build/dokka/htmlMultiModule ./docs/api
- name: Install python
uses: actions/setup-python@v5
Expand Down Expand Up @@ -84,10 +86,10 @@ jobs:
version=$(cat trckr.version | tr -d '\n')
echo "version=$version" >> $GITHUB_ENV
# - name: Create release
# uses: softprops/action-gh-release@v1
# with:
# body_path: ${{ github.workspace }}/changelog.md
# name: v${{ env.version }}
# tag_name: v${{ env.version }}
# token: ${{ secrets.GITHUB_TOKEN }}
- name: Create release
uses: softprops/action-gh-release@v1
with:
body_path: ${{ github.workspace }}/changelog.md
name: v${{ env.version }}
tag_name: v${{ env.version }}
token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -170,4 +170,3 @@ local.properties

### Documentation ###
site/
docs/api
Empty file.
12 changes: 2 additions & 10 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import org.jetbrains.dokka.gradle.DokkaMultiModuleTask

plugins {
alias(libs.plugins.ksp) apply false
alias(libs.plugins.kotlin.jvm) apply false
Expand All @@ -8,16 +6,10 @@ plugins {
alias(libs.plugins.binaryvalidator)
}

tasks.withType<DokkaMultiModuleTask>().named {
it.contains("Html")
}.configureEach {
outputDirectory.set(rootProject.layout.projectDirectory.dir("docs/api"))
}

apiValidation {
with(ignoredProjects) {
add("trckr-demo")
add("trckr-processor")
add(projects.trckrDemo.name)
add(projects.trckrProcessor.name)
}
nonPublicMarkers.add("ru.cookedapp.trckr.core.annotations.internal.TrckrInternal")
}
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ markdown_extensions:
permalink: true
title: 'On this page'
- pymdownx.highlight:
auto_title: true # Add codeblock language title
auto_title: true # Add code block language title
- pymdownx.inlinehilite # Syntax highlighting of inline code blocks
- pymdownx.superfences: # Allow nesting of code and content blocks inside each other
custom_fences:
Expand Down

0 comments on commit eb335c8

Please sign in to comment.