Skip to content

Commit a8f1260

Browse files
v1r3nv1r3n
committed
deployment preparation
1 parent 3faeec6 commit a8f1260

11 files changed

+60
-118
lines changed

‎.github/dependabot.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ updates:
55
schedule:
66
interval: "weekly"
77
reviewers:
8-
- "aravindanr"
9-
- "jxu-nflx"
10-
- "apanicker-nflx"
8+
- "v1r3n"
9+
- "boney9"
10+
- "c4lm"
1111
- package-ecosystem: "github-actions"
1212
directory: "/"
1313
schedule:

‎.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Pull Request type
33
- [ ] Bugfix
44
- [ ] Feature
55
- [ ] Refactoring (no functional changes, no api changes)
6-
- [ ] Build related changes (Please run `./gradlew generateLock saveLock` to refresh dependencies)
6+
- [ ] Build related changes
77
- [ ] WHOSUSING.md
88
- [ ] Other (please describe):
99

‎.github/workflows/generate_gh_pages.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: Publish docs via GitHub Pages
22
on:
3-
push:
4-
branches:
5-
- main
3+
workflow_dispatch
64

75
jobs:
86
build:

‎.github/workflows/publish.yml

+26-30
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,40 @@
1-
name: Publish OSS Conductor
2-
3-
1+
name: Publish Conductor OSS toMaven Central
42
on:
53
release:
64
types:
75
- released
86
- prereleased
97

8+
permissions:
9+
contents: read
10+
1011
jobs:
11-
# This workflow contains a single job called "build"
12-
build:
13-
# The type of runner that the job will run on
12+
publish:
1413
runs-on: ubuntu-latest
15-
16-
# Steps represent a sequence of tasks that will be executed as part of the job
14+
name: Gradle Build and Publish
1715
steps:
18-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
1916
- uses: actions/checkout@v3
20-
21-
# Checkout Conductor version tag and publish an initial release
22-
- name: Build and Deploy Conductor Main
17+
- name: Set up Zulu JDK 17
18+
uses: actions/setup-java@v3
19+
with:
20+
distribution: 'zulu'
21+
java-version: '17'
22+
- name: Cache Gradle packages
23+
uses: actions/cache@v3
24+
with:
25+
path: |
26+
~/.gradle/caches
27+
~/.gradle/wrapper
28+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
29+
restore-keys: |
30+
${{ runner.os }}-gradle-
31+
- name: Publish release
2332
run: |
24-
export TAG=$(git tag)
25-
export CONDUCTOR_VERSION=`echo $TAG | cut -f2 -d"v"`
26-
echo "CONDUCTOR_VERSION is $CONDUCTOR_VERSION"
27-
echo "Tag to checkout and publish $TAG"
28-
git clone -b $TAG https://github.com/conductor-oss/conductor.git
29-
cd conductor
30-
git checkout tags/$TAG
31-
git describe --tags --abbrev=0
32-
ls -ltr
33-
echo "Updating build.gradle - and printing its content"
34-
cat ../deploy.gradle
35-
cp ../deploy.gradle .
36-
echo "apply from: "\"\$rootDir/deploy.gradle\""" >> build.gradle
37-
cat build.gradle
38-
cat deploy.gradle
39-
./gradlew publish -PmavenCentral -Pusername=${{ secrets.SONATYPE_USERNAME }} -Ppassword=${{ secrets.SONATYPE_PASSWORD }}
40-
echo "All done"
33+
export VERSION="${{github.ref_name}}"
34+
export PUBLISH_VERSION=`echo ${VERSION:1}`
35+
echo Publishing version $PUBLISH_VERSION
36+
./gradlew publish -Pversion=$PUBLISH_VERSION -Pusername=${{ secrets.SONATYPE_USERNAME }} -Ppassword=${{ secrets.SONATYPE_PASSWORD }}
4137
env:
4238
ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.SIGNING_KEY_ID }}
4339
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
44-
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
40+
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}

‎.github/workflows/stale.yml

-28
This file was deleted.

‎annotations-processor/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ sourceSets {
66
dependencies {
77
implementation project(':conductor-annotations')
88
api 'com.google.guava:guava:31.1-jre'
9-
api 'com.squareup:javapoet:1.13.+'
10-
api 'com.github.jknack:handlebars:4.3.+'
9+
api 'com.squareup:javapoet:1.13.0'
10+
api 'com.github.jknack:handlebars:4.3.1'
1111
api 'com.google.protobuf:protobuf-java:3.21.12'
1212
api 'jakarta.annotation:jakarta.annotation-api:2.1.1'
1313
api gradleApi()

‎build.gradle

+6-25
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,12 @@ plugins {
1717
id 'io.spring.dependency-management' version '1.0.13.RELEASE'
1818
id 'java'
1919
id 'application'
20-
id 'jacoco'
21-
id 'nebula.netflixoss' version '10.6.0'
20+
id 'maven-publish'
21+
id 'signing'
22+
id 'java-library'
23+
id "com.diffplug.spotless" version "5.0.0"
2224
}
2325

24-
/*
25-
* Copyright 2023 Conductor authors
26-
* <p>
27-
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
28-
* the License. You may obtain a copy of the License at
29-
* <p>
30-
* http://www.apache.org/licenses/LICENSE-2.0
31-
* <p>
32-
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
33-
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
34-
* specific language governing permissions and limitations under the License.
35-
*/
36-
3726
// Establish version and status
3827
ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name
3928

@@ -43,17 +32,17 @@ subprojects {
4332

4433
apply from: "$rootDir/dependencies.gradle"
4534
apply from: "$rootDir/springboot-bom-overrides.gradle"
35+
apply from: "$rootDir/deploy.gradle"
4636

4737
allprojects {
48-
apply plugin: 'nebula.netflixoss'
4938
apply plugin: 'io.spring.dependency-management'
5039
apply plugin: 'java-library'
5140
apply plugin: 'project-report'
5241

5342
sourceCompatibility = JavaVersion.VERSION_17
5443
targetCompatibility = JavaVersion.VERSION_17
5544

56-
group = 'com.netflix.conductor'
45+
group = 'org.conductoross'
5746

5847
configurations.all {
5948
exclude group: 'ch.qos.logback', module: 'logback-classic'
@@ -111,14 +100,6 @@ allprojects {
111100
}
112101
}
113102

114-
jacocoTestReport {
115-
reports {
116-
html.required = true
117-
xml.required = true
118-
csv.required = false
119-
}
120-
}
121-
122103
task server {
123104
dependsOn ':conductor-server:bootRun'
124105
}

‎dependencies.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ext {
3131
revGrpc = '1.57.2'
3232
revGuava = '30.0-jre'
3333
revHamcrestAllMatchers = '1.8'
34-
revHealth = '1.1.+'
34+
revHealth = '1.1.4'
3535
revProtoBuf = '3.21.12'
3636
revJakartaAnnotation = '2.1.1'
3737
revJAXB = '4.0.1'

‎dependencies.lock

-10
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,6 @@
2121
"locked": "2.20.0"
2222
}
2323
},
24-
"jacocoAgent": {
25-
"org.jacoco:org.jacoco.agent": {
26-
"locked": "0.8.8"
27-
}
28-
},
29-
"jacocoAnt": {
30-
"org.jacoco:org.jacoco.ant": {
31-
"locked": "0.8.8"
32-
}
33-
},
3424
"runtimeClasspath": {
3525
"org.apache.logging.log4j:log4j-api": {
3626
"locked": "2.20.0"

‎deploy.gradle

+19-14
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11

2-
allprojects {
2+
subprojects {
33

44
apply plugin: 'maven-publish'
55
apply plugin: 'java-library'
66
apply plugin: 'signing'
77

88
group = 'org.conductoross'
9-
def conductorVersion = System.getenv('CONDUCTOR_VERSION')
10-
if (conductorVersion) {
11-
println "Inferred version from env variable 'CONDUCTOR_VERSION': $conductorVersion"
12-
version = conductorVersion
13-
}
149

1510
publishing {
1611
publications {
1712
mavenJava(MavenPublication) {
1813
from components.java
14+
versionMapping {
15+
usage('java-api') {
16+
fromResolutionOf('runtimeClasspath')
17+
}
18+
usage('java-runtime') {
19+
fromResolutionResult()
20+
}
21+
}
1922
pom {
2023
name = 'Conductor OSS'
2124
description = 'Conductor OSS build.'
@@ -44,8 +47,7 @@ allprojects {
4447

4548
repositories {
4649
maven {
47-
println "Publishing to Sonatype Repository"
48-
url = "https://s01.oss.sonatype.org/${project.version.endsWith('-SNAPSHOT') ? "content/repositories/snapshots/" : "service/local/staging/deploy/maven2/"}"
50+
url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
4951
credentials {
5052
username project.properties.username
5153
password project.properties.password
@@ -56,14 +58,17 @@ allprojects {
5658

5759
signing {
5860
def signingKeyId = findProperty('signingKeyId')
59-
def signingKey = findProperty('signingKey')
60-
def signingPassword = findProperty('signingPassword')
61-
System.out.println("signingKeyId: " + signingKeyId)
62-
if (signingKeyId && signingKey && signingPassword) {
63-
useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
61+
if (signingKeyId) {
62+
println 'Signing artifacts with keys'
63+
def signingKey = findProperty('signingKey')
64+
def signingPassword = findProperty('signingPassword')
65+
if (signingKeyId && signingKey && signingPassword) {
66+
useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
67+
}
68+
69+
sign publishing.publications
6470
}
6571

66-
sign publishing.publications
6772
}
6873

6974
}

‎es6-persistence/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ dependencies {
3737

3838
switch (org.gradle.internal.os.OperatingSystem.current()) {
3939
case org.gradle.internal.os.OperatingSystem.MAC_OS:
40-
//tasks.forEach(task -> task.onlyIf { project.hasProperty('ES6Test') })
40+
tasks.forEach(task -> task.onlyIf { project.hasProperty('ES6Test') })
4141
break;
4242
}

0 commit comments

Comments
 (0)