Skip to content

Commit

Permalink
Merge pull request #16 from reduxkotlin/feature/github-actions
Browse files Browse the repository at this point in the history
Add GitHub actions for test & publish
  • Loading branch information
patjackson52 committed Jul 7, 2020
2 parents 1dc8db3 + 34a2d3e commit 951cddf
Show file tree
Hide file tree
Showing 14 changed files with 120 additions and 15 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/publish_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Publish a release

on:
push:
tags:
- 'v*'

jobs:
publish:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]

steps:
- uses: actions/checkout@v2

- name: Publish Release
env:
SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
GPG_SECRET: ${{ secrets.GPG_SECRET }}
GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
run: ./gradlew publish
50 changes: 50 additions & 0 deletions .github/workflows/publish_snapshot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Publish snapshot

on:
push:
branches: [ master, feature/* ]
pull_request:
branches: [ master ]

jobs:
publish-snapshot:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]

steps:
- uses: actions/checkout@v2

- name: Publish macOS artifacts Snapshot
id: publish-macos
if: matrix.os == 'macos-latest'
env:
SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
GPG_SECRET: ${{ secrets.GPG_SECRET }}
GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
SNAPSHOT: 'TRUE'
run: ./gradlew publish

- name: Publish windows artifacts Snapshot
id: publish-win
if: matrix.os == 'windows-latest'
env:
SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
GPG_SECRET: ${{ secrets.GPG_SECRET }}
GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
SNAPSHOT: 'TRUE'
run: ./gradlew publish

- name: Publish linux artifacts Snapshot
id: publish-linux
if: matrix.os == 'ubuntu-latest'
env:
SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
GPG_SECRET: ${{ secrets.GPG_SECRET }}
GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
SNAPSHOT: 'TRUE'
run: ./gradlew publish
28 changes: 28 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Test

on:
pull_request:
paths-ignore:
- 'docs/**'
- '*.md'

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Test
run: ./gradlew jvmTest

- name: Archive redux-kotlin Test Reports
uses: actions/upload-artifact@v1
with:
name: redux-kotlin_test_reports
path: redux-kotlin/build/reports/tests

- name: Archive redux-kotlin-threadsafe Test Reports
uses: actions/upload-artifact@v1
with:
name: redux-kotlin-threadsafe_test_reports
path: redux-kotlin-threadsafe/build/reports/tests
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ kotlin {
sourceSets {
commonMain { // <--- name may vary on your project
dependencies {
implementation "org.reduxkotlin:redux-kotlin-thunk:0.4.0"
implementation "org.reduxkotlin:redux-kotlin-thunk:0.5.3"
}
}
}
```

For JVM only:
```
implementation "org.reduxkotlin:redux-kotlin-jvm-thunk:0.4.0"
implementation "org.reduxkotlin:redux-kotlin-jvm-thunk:0.5.3"
```

[badge-android]: http://img.shields.io/badge/platform-android-brightgreen.svg?style=flat
Expand Down
3 changes: 3 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ allprojects {

group = GROUP
version = VERSION_NAME
if (hasProperty("SNAPSHOT") || System.getenv("SNAPSHOT") != null) {
version = version + "-SNAPSHOT"
}
}

task clean(type: Delete) {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ kotlin.code.style=official
org.gradle.internal.publish.checksums.insecure=true

GROUP=org.reduxkotlin
VERSION_NAME=0.4.0
VERSION_NAME=0.5.3

POM_ARTIFACT_ID=reduxkotlin-thunk
POM_DESCRIPTION=Redux thunmk implementation for Redux-Kotlin. Mulitiplatform supported.
Expand Down
4 changes: 2 additions & 2 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ext.versions = [
kotlin : '1.3.70',
kotlin : '1.3.72',
dokka : '0.9.17',
spek : '2.1.0-alpha.0.9+3d5d865',
atrium : '0.8.0',
redux : '0.4.0'
redux : '0.5.3'
]

ext.deps = [
Expand Down
11 changes: 7 additions & 4 deletions gradle/publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ dokka {
}

def isReleaseBuild() {
return VERSION_NAME.contains("SNAPSHOT") == false
return version.contains("SNAPSHOT") == false
}

def getReleaseRepositoryUrl() {
Expand All @@ -58,11 +58,11 @@ def getSnapshotRepositoryUrl() {
}

def getRepositoryUsername() {
return hasProperty('SONATYPE_NEXUS_USERNAME') ? SONATYPE_NEXUS_USERNAME : ""
return findProperty('SONATYPE_NEXUS_USERNAME') ?: System.getenv('SONATYPE_NEXUS_USERNAME') ?: ""
}

def getRepositoryPassword() {
return hasProperty('SONATYPE_NEXUS_PASSWORD') ? SONATYPE_NEXUS_PASSWORD : ""
return findProperty('SONATYPE_NEXUS_PASSWORD') ?: System.getenv('SONATYPE_NEXUS_PASSWORD') ?: ""
}

task emptySourcesJar(type: Jar) {
Expand All @@ -75,7 +75,10 @@ task javadocsJar(type: Jar, dependsOn: dokka) {
}

signing {
required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
required { isReleaseBuild() /*&& gradle.taskGraph.hasTask("uploadArchives") */ }
def signingKey = findProperty("GPG_SECRET") ?: System.getenv('GPG_SECRET') ?: ""
def signingPassword = findProperty("GPG_SIGNING_PASSWORD") ?: System.getenv('GPG_SIGNING_PASSWORD') ?: ""
useInMemoryPgpKeys(signingKey, signingPassword)
sign(publishing.publications)
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/build.gradle → redux-kotlin-thunk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apply plugin: 'kotlin-multiplatform'
archivesBaseName = 'redux-kotlin-thunk'

group 'org.reduxkotlin'
version '0.4.0'
version '0.5.3'

kotlin {
jvm()
Expand Down
File renamed without changes.
5 changes: 1 addition & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ pluginManagement {
}
}

include ':lib'
include ':redux-kotlin-thunk'
rootProject.name='Redux-Kotlin-thunk'


rootProject.name = 'test'
enableFeaturePreview('GRADLE_METADATA')

0 comments on commit 951cddf

Please sign in to comment.