fix gradle publish

This commit is contained in:
William Cheng 2023-02-19 19:40:12 +08:00
parent 617c53d65d
commit 622071e70e
3 changed files with 27 additions and 24 deletions

View File

@ -154,7 +154,10 @@ script:
#- mvn -e --no-snapshot-updates --quiet --batch-mode --show-version verify -Psamples -Dorg.slf4j.simpleLogger.defaultLogLevel=error #- mvn -e --no-snapshot-updates --quiet --batch-mode --show-version verify -Psamples -Dorg.slf4j.simpleLogger.defaultLogLevel=error
after_success: after_success:
# push to maven repo # push to maven repo
#- if [ $SONATYPE_USERNAME ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then - export TRAVIS_TAG=v6.4.0
- export TRAVIS_BRANCH=master
- export TRAVIS_PULL_REQUEST=false
- if [ $SONATYPE_USERNAME ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
# if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ]; then # if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ]; then
# echo "Publishing from branch $TRAVIS_BRANCH"; # echo "Publishing from branch $TRAVIS_BRANCH";
# mvn clean deploy -DskipTests=true -B -U -P release --settings CI/settings.xml; # mvn clean deploy -DskipTests=true -B -U -P release --settings CI/settings.xml;
@ -174,19 +177,16 @@ after_success:
# echo "Finished ./gradlew publishPluginMavenPublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository"; # echo "Finished ./gradlew publishPluginMavenPublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository";
# popd; # popd;
# fi; # fi;
# if [ -n $TRAVIS_TAG ] && [[ "$TRAVIS_TAG" =~ ^[v][0-9]+\.[0-9]+\.[0-9]+$ ]]; then if [ -n $TRAVIS_TAG ] && [[ "$TRAVIS_TAG" =~ ^[v][0-9]+\.[0-9]+\.[0-9]+$ ]]; then
# echo "Publishing the gradle plugin to Gradle Portal on tag $TRAVIS_TAG (only)"; echo "Publishing the gradle plugin to Gradle Portal on tag $TRAVIS_TAG (only)";
# pushd .; pushd .;
# cd modules/openapi-generator-gradle-plugin; cd modules/openapi-generator-gradle-plugin;
# ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" publishPlugins -Dgradle.publish.key=$GRADLE_PUBLISH_KEY -Dgradle.publish.secret=$GRADLE_PUBLISH_SECRET; ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" publishPlugins -Dgradle.publish.key=$GRADLE_PUBLISH_KEY -Dgradle.publish.secret=$GRADLE_PUBLISH_SECRET;
# echo "Finished ./gradlew publishPlugins (plugin portal)"; echo "Finished ./gradlew publishPlugins (plugin portal)";
# popd; popd;
# fi; fi;
# fi; fi;
## docker: build and push openapi-generator-online to DockerHub ## docker: build and push openapi-generator-online to DockerHub
- export TRAVIS_TAG=v6.4.0
- export TRAVIS_BRANCH=master
- export TRAVIS_PULL_REQUEST=false
- if [ $DOCKER_HUB_USERNAME ]; then - if [ $DOCKER_HUB_USERNAME ]; then
echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin; echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin;
export cli_version=$(\mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\['); export cli_version=$(\mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[');
@ -218,15 +218,15 @@ after_success:
echo "Pushed to $DOCKER_CODEGEN_CLI_IMAGE_NAME"; echo "Pushed to $DOCKER_CODEGEN_CLI_IMAGE_NAME";
fi; fi;
fi; fi;
# publish latest website, variables below are secure environment variables which are unavailable to PRs from forks. publish latest website, variables below are secure environment variables which are unavailable to PRs from forks.
#- if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then - if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
# cd website; cd website;
# git config --global user.name "${GH_NAME}"; git config --global user.name "${GH_NAME}";
# git config --global user.email "${GH_EMAIL}"; git config --global user.email "${GH_EMAIL}";
# echo "machine github.com login ${GH_NAME} password ${GH_TOKEN}" > ~/.netrc; echo "machine github.com login ${GH_NAME} password ${GH_TOKEN}" > ~/.netrc;
# yarn install; yarn install;
# GIT_USER="${GH_NAME}" yarn run publish-gh-pages; GIT_USER="${GH_NAME}" yarn run publish-gh-pages;
# fi; fi;
env: env:
- DOCKER_GENERATOR_IMAGE_NAME=openapitools/openapi-generator-online DOCKER_CODEGEN_CLI_IMAGE_NAME=openapitools/openapi-generator-cli NODE_ENV=test CC=gcc-5 CXX=g++-5 - DOCKER_GENERATOR_IMAGE_NAME=openapitools/openapi-generator-online DOCKER_CODEGEN_CLI_IMAGE_NAME=openapitools/openapi-generator-cli NODE_ENV=test CC=gcc-5 CXX=g++-5

View File

@ -3,7 +3,7 @@ import io.github.gradlenexus.publishplugin.ReleaseNexusStagingRepository
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
id("com.gradle.plugin-publish") version "1.0.0" id("com.gradle.plugin-publish") version "1.1.0"
id("io.github.gradle-nexus.publish-plugin") version "1.1.0" id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
id("java-gradle-plugin") id("java-gradle-plugin")
id("maven-publish") id("maven-publish")
@ -113,7 +113,7 @@ nexusPublishing {
// or stored as key=value pairs in ~/.gradle/gradle.properties // or stored as key=value pairs in ~/.gradle/gradle.properties
// You can also apply them in CI via environment variables. See Gradle's docs for details. // You can also apply them in CI via environment variables. See Gradle's docs for details.
signing { signing {
required { isReleaseVersion && gradle.taskGraph.hasTask("publishPluginMavenPublicationToSonatypeRepository") } //required { isReleaseVersion && gradle.taskGraph.hasTask("publishPluginMavenPublicationToSonatypeRepository") }
sign(publishing.publications) sign(publishing.publications)
} }

View File

@ -81,6 +81,9 @@
<gradleVersion>${gradleVersion}</gradleVersion> <gradleVersion>${gradleVersion}</gradleVersion>
<args> <args>
<arg>-P openApiGeneratorVersion=${project.version}</arg> <arg>-P openApiGeneratorVersion=${project.version}</arg>
<arg>-Psigning.keyId=${env.SIGNING_KEY}</arg>
<arg>-Psigning.password=${env.SIGNING_PASSPHRASE}</arg>
<arg>-Psigning.secretKeyRingFile=${env.TRAVIS_BUILD_DIR}/sec.gpg</arg>v
</args> </args>
</configuration> </configuration>
<executions> <executions>