This is an automated email from the ASF dual-hosted git repository. tomaswolf pushed a commit to branch dev_3.0 in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 62f3e2b703784ee06fe1c846e0cb4eea5ded34eb Merge: 8c0928bbe 2f21ce067 Author: Thomas Wolf <[email protected]> AuthorDate: Mon Sep 28 21:30:13 2026 +0200 Merge branch 'master' into dev_3.0 .github/workflows/build.yml | 14 +++++++------- .github/workflows/master-build.yml | 6 +++--- .github/workflows/next-build.yml | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --cc .github/workflows/next-build.yml index bf57ab5cd,000000000..b3524f21e mode 100644,000000..100644 --- a/.github/workflows/next-build.yml +++ b/.github/workflows/next-build.yml @@@ -1,115 -1,0 +1,115 @@@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +name: next-build + +on: + push: + branches: + - 'dev_3.0' + paths-ignore: + - 'docs/**' + - '*.md' + - '.github/ISSUE_TEMPLATE/**' + - '*.txt' + +jobs: + build: + uses: ./.github/workflows/build.yml + + deploy-snapshot: + # Skip any commit from creating releases. The first snapshot after a new release + # will thus be published on the first real change on the new snapshot version, but + # there will be no snapshot release for just bumping the version. + if: "!startsWith(github.event.head_commit.message ,'[maven-release-plugin]')" + needs: build + # Serialize these jobs from different workflow runs. We do not want concurrent + # deployments. We don't cancel already running jobs because we do not want their + # workflows to report a failure. Github does not guarantee order between jobs + # that queue within 5 minutes, see https://docs.github.com/en/actions/using-jobs/using-concurrency . + # We do check below that the job is operating on the latest origin/master, and + # we skip deployment if not. + concurrency: mina-sshd-next-snapshot-deploy + runs-on: ubuntu-latest + steps: - - uses: actions/checkout@v6 ++ - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 #v7.0.1 + + - name: Set up JDK - uses: actions/setup-java@v5 ++ uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 #v6.0.1 + with: + distribution: temurin + java-version: '25' + # Create a ~/.m2/settings.xml referencing these environment variable names + server-id: 'apache.snapshots.https' + server-username: NEXUS_USERNAME + server-password: NEXUS_PASSWORD + - - uses: actions/cache@v5 ++ - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 #v6.1.0 + with: + path: ~/.m2/repository + key: ubuntu-latest-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ubuntu-latest-maven- + + - name: Check version (SNAPSHOT) + # Only deploy SNAPSHOT versions. We do not use "exit 1" because we still want the workflow + # to report success, we just want this job to do nothing. + # + # All subsequent steps are conditional. + run: | + export PROJECT_VERSION=$(./mvnw -B -q -DforceStdout -Dexpression=project.version help:evaluate) + echo "Project version: $PROJECT_VERSION" + [[ "$PROJECT_VERSION" =~ ^3\.[0-9]+\.[0-9]+-SNAPSHOT$ ]] || { + echo "**** Skipping deployment because not a snapshot version: $PROJECT_VERSION" 1>&2 + echo "SKIP_DEPLOYMENT=true" >> "$GITHUB_ENV" + } + + - name: Check HEAD is current + # Must be quoted, ! is special in yaml + if: "! env.SKIP_DEPLOYMENT" + # Do not deploy if refs/heads/dev_3.0 has advanced in the meantime + run : | + export CURR_HEAD=$(git rev-parse -q origin/dev_3.0) + echo "Local: github.sha=${{ github.sha }} refs/heads/dev_3.0=$(git rev-parse -q refs/heads/dev_3.0)" + echo "Origin: origin/dev_3.0=$CURR_HEAD" + [[ "${{ github.sha }}" == "$CURR_HEAD" ]] || { + echo "**** Skipping deployment because dev_3.0 branch advanced: ${{ github.sha }} != origin/dev_3.0 $CURR_HEAD" 1>&2 + echo "SKIP_DEPLOYMENT=true" >> "$GITHUB_ENV" + } + + - name: Build and deploy with maven + # Must be quoted, ! is special in yaml + if: "! env.SKIP_DEPLOYMENT" + # NEXUS_USERNAME and NEXUS_PASSWORD are used in ~/.m2/settings.xml created by + # the setup-java action. The two secrets are organization-wide secrets that + # were enabled by Apache Infra for our repository. + env: + NEXUS_USERNAME: ${{ secrets.NEXUS_USER }} + NEXUS_PASSWORD: ${{ secrets.NEXUS_PW }} + # Our root POM overwrites the release repository with an invalid value to prevent + # accidental release deployments as an additional safety measure. The snapshot + # repo from the Apache parent POM is not overridden. + run: ./mvnw -B --errors --activate-profiles ci --no-transfer-progress deploy -DskipTests -DdeployAtEnd + + - name: Build and deploy web site + if: "! env.SKIP_DEPLOYMENT" + # git config needs to be --global because scm-publish will clone the repo again. + run: | + git config --global user.name "github-actions[bot]" + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" + ./mvnw -B --no-transfer-progress -DskipTests -Pjapicmp clean install + ./mvnw -B --no-transfer-progress scm-publish:publish-scm -Dgithub.actor=${{ github.actor }} -Dgithub.token=${{ secrets.GITHUB_TOKEN }}
