diff --git a/.github/workflows/deploy-maven-central.yml b/.github/workflows/deploy-maven-central.yml index 1734a82..d4454fb 100644 --- a/.github/workflows/deploy-maven-central.yml +++ b/.github/workflows/deploy-maven-central.yml @@ -2,12 +2,12 @@ name: Deploy to Maven Central on: pull_request: - types: [closed] + types: [opened, synchronize] branches: [main] jobs: deploy: - if: github.event.pull_request.merged == true && github.head_ref == 'develop' + if: github.head_ref == 'develop' || startsWith(github.head_ref, 'release/') runs-on: ubuntu-latest steps: @@ -15,10 +15,10 @@ jobs: uses: actions/checkout@v4 - name: Import GPG key - uses: crazy-max/ghaction-import-gpg@v6 + uses: crazy-max/ghaction-import-gpg@v5 with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - passphrase: ${{ secrets.GPG_PASSPHRASE }} + gpg_private_key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} + passphrase: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - name: Set up Java uses: actions/setup-java@v4 @@ -29,12 +29,61 @@ jobs: - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@v2 + - name: Determine version from branch + id: version + run: | + BRANCH_NAME="${{ github.head_ref }}" + echo "Source branch: $BRANCH_NAME" + + # Set version based on branch name + if [[ "$BRANCH_NAME" =~ ^release/v([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then + VERSION="${BASH_REMATCH[1]}" + echo "Release branch detected, version: $VERSION" + elif [[ "$BRANCH_NAME" == "main" ]]; then + VERSION="1.2.1" + echo "Main branch detected, using base version: $VERSION" + else + SANITIZED_BRANCH=$(echo "$BRANCH_NAME" | sed 's/[^a-zA-Z0-9]/-/g') + VERSION="1.2.1-${SANITIZED_BRANCH}-SNAPSHOT" + echo "Feature branch detected, version: $VERSION" + fi + + echo "version=$VERSION" >> $GITHUB_OUTPUT + echo "Final version: $VERSION" + + - name: Debug environment variables + run: | + echo "MAVEN_USERNAME is set: ${{ secrets.MAVEN_USERNAME != '' }}" + echo "MAVEN_PASSWORD is set: ${{ secrets.MAVEN_PASSWORD != '' }}" + echo "Checking environment variables..." + env | grep -E "ORG_GRADLE_PROJECT_|GITHUB_" | sort + - name: Publish package - uses: gradle/gradle-build-action@v3 + uses: gradle/gradle-build-action@v2 with: - arguments: publishToSonatype closeAndReleaseSonatypeStagingRepository + arguments: | + -PmavenCentralUsername=${{ secrets.MAVEN_USERNAME }} + -PmavenCentralPassword=${{ secrets.MAVEN_PASSWORD }} + -PsigningInMemoryKeyId=${{ secrets.MAVEN_GPG_KEY_ID }} + -PsigningInMemoryPassword=${{ secrets.MAVEN_GPG_PASSPHRASE }} + allTests publishAndReleaseToMavenCentral env: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} \ No newline at end of file + + - name: Auto-merge PR on successful deployment + if: success() + uses: actions/github-script@v7 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + const pr = context.payload.pull_request; + if (pr) { + await github.rest.pulls.merge({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: pr.number, + merge_method: 'merge' + }); + console.log(`PR #${pr.number} has been automatically merged after successful deployment`); + } \ No newline at end of file diff --git a/README.md b/README.md index 2479f40..cb82720 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # renlin-router + ## About * A routing library for renlin diff --git a/convention-plugins/src/main/kotlin/root.publication.gradle.kts b/convention-plugins/src/main/kotlin/root.publication.gradle.kts index fcbbbcd..32c9dd8 100644 --- a/convention-plugins/src/main/kotlin/root.publication.gradle.kts +++ b/convention-plugins/src/main/kotlin/root.publication.gradle.kts @@ -3,14 +3,67 @@ plugins { } object Conf { const val GROUP = "net.kigawa" - const val VERSION = "1.0.0" + // Base version - will be modified based on branch name if available + const val BASE_VERSION = "1.2.1" } +// Determine version based on branch name +// Branch naming convention for releases: release/vx.x.x (e.g., release/v1.0.0) +fun determineVersion(): String { + // Try to get branch name from different environment variables + // For pull requests, GITHUB_HEAD_REF contains the source branch name + // For direct pushes, GITHUB_REF_NAME contains the branch name + val branchName = System.getenv("GITHUB_HEAD_REF") + ?: System.getenv("GITHUB_REF_NAME") + ?: return Conf.BASE_VERSION + + // For main branch, use the base version + if (branchName == "main") { + return Conf.BASE_VERSION + } + + // For release branches in format 'release/vx.x.x', use the version from the branch name + val releasePattern = Regex("^release/v(\\d+\\.\\d+\\.\\d+)$") + val matchResult = releasePattern.find(branchName) + if (matchResult != null) { + // Extract version number from branch name + val versionFromBranch = matchResult.groupValues[1] + return versionFromBranch + } + + // For other branches, use format: baseVersion-branchName-SNAPSHOT + // Replace any non-alphanumeric characters with dashes for Maven compatibility + val sanitizedBranchName = branchName.replace(Regex("[^a-zA-Z0-9]"), "-") + return "${Conf.BASE_VERSION}-${sanitizedBranchName}-SNAPSHOT" +} + +val projectVersion = determineVersion() + group = Conf.GROUP -version = Conf.VERSION +version = projectVersion allprojects { + apply(plugin = "common") group = Conf.GROUP - version = Conf.VERSION + version = projectVersion +} + +// Add a task to print the version (useful for debugging) +tasks.register("printVersion") { + doLast { + val branchName = System.getenv("GITHUB_HEAD_REF") ?: System.getenv("GITHUB_REF_NAME") ?: "unknown" + println("Project version: $version") + println("Determined from branch: $branchName") + + // Check if it's a release branch + val releasePattern = Regex("^release/v(\\d+\\.\\d+\\.\\d+)$") + val isReleaseBranch = releasePattern.matches(branchName) + println("Is release branch format (release/vx.x.x): $isReleaseBranch") + + if (isReleaseBranch) { + val versionFromBranch = releasePattern.find(branchName)?.groupValues?.get(1) + println("Version extracted from branch name: $versionFromBranch") + } + } } nexusPublishing { @@ -18,5 +71,6 @@ nexusPublishing { // https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-ossrh repositories { sonatype() + } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 095d5a9..9355b41 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Tue Mar 11 16:17:30 JST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 1b6c787..f5feea6 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +82,12 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 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"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +134,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. 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=SC2039,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=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +217,12 @@ 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. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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% :mainEnd if "%OS%"=="Windows_NT" endlocal