Fonts: fixed GitHub Actions:

- ci.yml: skip fonts in snapshot and release jobs
- fonts.yml: build on all branches/PRs; publish snapshots
- fixed version for font snapshots
This commit is contained in:
Karl Tauber
2022-11-19 10:48:07 +01:00
parent 24bc7fb0b5
commit b515e8be04
6 changed files with 42 additions and 15 deletions

View File

@@ -78,7 +78,7 @@ jobs:
cache: gradle cache: gradle
- name: Publish snapshot to oss.sonatype.org - name: Publish snapshot to oss.sonatype.org
run: ./gradlew publish :flatlaf-theme-editor:build -Dorg.gradle.internal.publish.checksums.insecure=true run: ./gradlew publish :flatlaf-theme-editor:build -PskipFonts -Dorg.gradle.internal.publish.checksums.insecure=true
env: env:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
@@ -114,7 +114,7 @@ jobs:
cache: gradle cache: gradle
- name: Release a new stable version to Maven Central - name: Release a new stable version to Maven Central
run: ./gradlew publish :flatlaf-demo:build :flatlaf-theme-editor:build -Drelease=true run: ./gradlew publish :flatlaf-demo:build :flatlaf-theme-editor:build -PskipFonts -Prelease
env: env:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

View File

@@ -1,4 +1,5 @@
# https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
# https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
name: Fonts name: Fonts
@@ -11,23 +12,23 @@ on:
paths: paths:
- 'flatlaf-fonts/**' - 'flatlaf-fonts/**'
- '.github/workflows/fonts.yml' - '.github/workflows/fonts.yml'
- 'gradle/wrapper/gradle-wrapper.properties'
jobs: jobs:
Release: Fonts:
runs-on: ubuntu-latest
if: |
github.event_name == 'push' &&
github.repository == 'JFormDesigner/FlatLaf'
strategy: strategy:
matrix: matrix:
font: font:
- inter - inter
- jetbrains-mono - jetbrains-mono
runs-on: ubuntu-latest
if: |
github.event_name == 'push' &&
github.repository == 'JFormDesigner/FlatLaf'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
if: startsWith( github.ref, format( 'refs/tags/fonts/{0}-', matrix.font ) )
- name: Setup Java 11 - name: Setup Java 11
uses: actions/setup-java@v3 uses: actions/setup-java@v3
@@ -35,10 +36,20 @@ jobs:
java-version: 11 java-version: 11
distribution: adopt # pre-installed on ubuntu-latest distribution: adopt # pre-installed on ubuntu-latest
cache: gradle cache: gradle
if: startsWith( github.ref, format( 'refs/tags/fonts/{0}-', matrix.font ) )
- name: Build with Gradle
run: ./gradlew :flatlaf-fonts-${{ matrix.font }}:build
if: startsWith( github.ref, format( 'refs/tags/fonts/{0}-', matrix.font ) ) != true
- name: Publish snapshot to oss.sonatype.org
run: ./gradlew :flatlaf-fonts-${{ matrix.font }}:publish -Dorg.gradle.internal.publish.checksums.insecure=true
env:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
if: github.ref == 'refs/heads/main' || startsWith( github.ref, 'refs/heads/develop-' )
- name: Release a new stable version to Maven Central - name: Release a new stable version to Maven Central
run: ./gradlew :flatlaf-fonts-${{ matrix.font }}:build :flatlaf-fonts-${{ matrix.font }}:publish -Drelease=true run: ./gradlew :flatlaf-fonts-${{ matrix.font }}:build :flatlaf-fonts-${{ matrix.font }}:publish -Prelease
env: env:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

View File

@@ -17,7 +17,7 @@
val releaseVersion = "2.6" val releaseVersion = "2.6"
val developmentVersion = "3.0-SNAPSHOT" val developmentVersion = "3.0-SNAPSHOT"
version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion version = if( rootProject.hasProperty( "release" ) ) releaseVersion else developmentVersion
allprojects { allprojects {
version = rootProject.version version = rootProject.version

View File

@@ -80,7 +80,7 @@ publishing {
val releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" val releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
val snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/" val snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
url = uri( if( java.lang.Boolean.getBoolean( "release" ) ) releasesRepoUrl else snapshotsRepoUrl ) url = uri( if( rootProject.hasProperty( "release" ) ) releasesRepoUrl else snapshotsRepoUrl )
credentials { credentials {
// get from gradle.properties // get from gradle.properties
@@ -108,5 +108,5 @@ signing {
// disable signing of snapshots // disable signing of snapshots
tasks.withType<Sign>().configureEach { tasks.withType<Sign>().configureEach {
onlyIf { java.lang.Boolean.getBoolean( "release" ) } onlyIf { rootProject.hasProperty( "release" ) }
} }

View File

@@ -20,6 +20,10 @@
// necessary, but the <font-version> has not changed. // necessary, but the <font-version> has not changed.
version = "3.19" version = "3.19"
if( !rootProject.hasProperty( "release" ) )
version = version.toString() + "-SNAPSHOT"
plugins { plugins {
`java-library` `java-library`
`flatlaf-module-info` `flatlaf-module-info`
@@ -38,6 +42,10 @@ java {
} }
tasks { tasks {
all {
onlyIf { !rootProject.hasProperty( "skipFonts" ) }
}
named<Jar>( "sourcesJar" ) { named<Jar>( "sourcesJar" ) {
exclude( "**/*.ttf", "**/*.otf" ) exclude( "**/*.ttf", "**/*.otf" )
} }

View File

@@ -20,6 +20,10 @@
// necessary, but the <font-version> has not changed. // necessary, but the <font-version> has not changed.
version = "2.242" version = "2.242"
if( !rootProject.hasProperty( "release" ) )
version = version.toString() + "-SNAPSHOT"
plugins { plugins {
`java-library` `java-library`
`flatlaf-module-info` `flatlaf-module-info`
@@ -38,6 +42,10 @@ java {
} }
tasks { tasks {
all {
onlyIf { !rootProject.hasProperty( "skipFonts" ) }
}
named<Jar>( "sourcesJar" ) { named<Jar>( "sourcesJar" ) {
exclude( "**/*.ttf", "**/*.otf" ) exclude( "**/*.ttf", "**/*.otf" )
} }