Skip to content

Commit

Permalink
fix: failing using gitpush
Browse files Browse the repository at this point in the history
  • Loading branch information
mariogarcia committed Jan 10, 2023
1 parent 2219b6f commit 545e295
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 31 deletions.
38 changes: 38 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,42 @@ config {
roles = ['developer']
}
}
repositories {
repository {
name = 'releases'
url = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
credentials {
username = findProperty("PUBLISH_REPO_USERNAME")
password = findProperty("PUBLISH_REPO_PASSWORD")
}
}
repository {
name = 'snapshots'
url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
credentials {
username = findProperty("PUBLISH_REPO_USERNAME")
password = findProperty("PUBLISH_REPO_PASSWORD")
}
}
}
}
artifacts {
minpom {
enabled
}
}
publishing {
releasesRepository = "releases"
snapshotsRepository = "snapshots"
signing {
enabled = !version.endsWith("SNAPSHOT")
keyId = findProperty("PUBLISH_SIGN_KEY_ID")
secretKey = findProperty("PUBLISH_SIGN_KEY")
password = findProperty("PUBLISH_SIGN_SECRET")
}
pom {
overwriteInceptionYear = "2016"
}
}
licensing {
licenses {
Expand Down Expand Up @@ -99,6 +135,7 @@ static List<String> snapshots() {
return [
':groocss:publishAllPublicationsToSnapshotsRepository',
':groocss-gradle-plugin:publishAllPublicationsToSnapshotsRepository',
':website:generateSite',
':website:gitPublishPush',
'jreleaserRelease'
]
Expand All @@ -108,6 +145,7 @@ static List<String> releases() {
return [
':groocss:publish',
':groocss-gradle-plugin:publish',
':website:generateSite',
':website:gitPublishPush',
'jreleaserFullRelease'
]
Expand Down
7 changes: 3 additions & 4 deletions docs/website/website.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,11 @@ gitPublish {
}

gitPublishPush {
dependsOn 'setAuthentication'
dependsOn 'generateSite'
dependsOn('setAuthentication')
}

task generateSite {
dependsOn("clean", ":groocss:groovydoc", ":guide:asciidoctor", ":website:assetClean", ":website:assetCompile")
dependsOn(":groocss:groovydoc", ":guide:asciidoctor", ":website:assetClean", ":website:assetCompile")
doLast {
copy {
from "$rootDir/docs/guide/build/docs/asciidoc"
Expand All @@ -87,7 +86,7 @@ task generateSite {
}
}

task setAuthentication(dependsOn: 'generateSite') {
task setAuthentication {
doLast {
System.setProperty('org.ajoberstar.grgit.auth.username', findProperty('PUBLISH_GH_TOKEN'))
}
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ group = com.github.grooviter
groovyVersion = 3.0.10
spockframework = 2.3-groovy-3.0
assets_pipeline = 4.0.0
kordamp = 0.47.0
kordamp = 0.47.0
ajoberstar = 3.0.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
18 changes: 4 additions & 14 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,11 +80,11 @@ do
esac
done

# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

Expand Down Expand Up @@ -143,16 +143,12 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -209,12 +205,6 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
15 changes: 6 additions & 9 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%"=="" @echo off
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,8 +25,7 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
if "%ERRORLEVEL%" == "0" goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
if "%ERRORLEVEL%"=="0" goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
dependencies {
classpath "org.kordamp.gradle:settings-gradle-plugin:$kordamp"
classpath "org.kordamp.gradle:guide-gradle-plugin:$kordamp"
classpath "org.ajoberstar:gradle-git-publish:2.1.3"
classpath "org.ajoberstar:gradle-git-publish:$ajoberstar"
}
}
apply plugin: 'org.kordamp.gradle.settings'
Expand Down

0 comments on commit 545e295

Please sign in to comment.