github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'main' into feat/add-thumbnail-router

feat/add-thumbnail-router
Ryan Wang 2025-09-24 12:29:59 +08:00 committed by GitHub
parent 8f198d9583 db00883c3d
commit 0a0e49923a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/build.gradle
View File

@ -198,11 +198,12 @@ tasks.named('generateOpenApiDocs') {
} }
def name = 'halo' def name = 'halo'
def branchName = grgit.branch.current().name.replaceAll("/", "-")
def tagName = "${project.version}-cnb" def tagName = "${project.version}-cnb"
def isRelease = Objects.equals(project.findProperty('release'), 'true') def isRelease = Objects.equals(project.findProperty('release'), 'true')
if (!isRelease) { if (!isRelease) {
name = 'halo-dev' name = 'halo-dev'
tagName = "cnb-sha-${grgit.head().abbreviatedId}" tagName = "sha-${grgit.head().abbreviatedId}-cnb"
} }
tasks.register('publishToGhcr', BootBuildImage) { tasks.register('publishToGhcr', BootBuildImage) {
@ -211,7 +212,7 @@ tasks.register('publishToGhcr', BootBuildImage) {
imageName = "ghcr.io/halo-dev/${name}:${tagName}" imageName = "ghcr.io/halo-dev/${name}:${tagName}"
publish = StringUtils.hasText(System.getenv('GHCR_TOKEN')) publish = StringUtils.hasText(System.getenv('GHCR_TOKEN'))
if (!isRelease) { if (!isRelease) {
tags = ["ghcr.io/halo-dev/${name}:cnb-main".toString()] tags = ["ghcr.io/halo-dev/${name}:${branchName}-cnb".toString()]
} }
docker { docker {
publishRegistry { publishRegistry {
@ -228,7 +229,7 @@ tasks.register('publishToDockerHub', BootBuildImage) {
imageName = "halohub/${name}:${tagName}" imageName = "halohub/${name}:${tagName}"
publish = StringUtils.hasText(System.getenv('DOCKER_TOKEN')) publish = StringUtils.hasText(System.getenv('DOCKER_TOKEN'))
if (!isRelease) { if (!isRelease) {
tags = ["halohub/${name}:cnb-main".toString()] tags = ["halohub/${name}:${branchName}-cnb".toString()]
} }
docker { docker {
publishRegistry { publishRegistry {

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

3
gradlew vendored
View File

@ -114,7 +114,6 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;; NONSTOP* ) nonstop=true ;;
esac esac
CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
@ -172,7 +171,6 @@ fi
# For Cygwin or MSYS, switch paths to Windows format before running java # For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" ) JAVACMD=$( cygpath --unix "$JAVACMD" )
@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \ set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \ "-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@" "$@"

3
gradlew.bat vendored
View File

@ -70,11 +70,10 @@ goto fail
:execute :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH=
@rem Execute Gradle @rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell