diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 82e4fa2..378ed57 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -11,7 +11,8 @@ jobs: strategy: matrix: include: - - { os: ubuntu-20.04, arch: "linux/amd64" } + - { os: ubuntu-20.04, arch: "linux/amd64", ssl: "ssl1" } + - { os: ubuntu-20.04, arch: "linux/amd64", ssl: "ssl3" } runs-on: ${{ matrix.os }} steps: - name: Branch name @@ -29,8 +30,10 @@ jobs: run: | # ====== Variables export REVISION=${{ steps.branch_name.outputs.SOURCE_TAG_VERSION }} + export SSL_TYPE=${{ matrix.ssl }} echo "REVISION=$REVISION" >> $GITHUB_ENV + echo "SSL_TYPE=$SSL_TYPE" >> $GITHUB_ENV - name: Set up JDK 17 (Snapshot) if: ${{ !startsWith(github.ref, 'refs/tags/v') }} uses: actions/setup-java@v3 @@ -42,7 +45,7 @@ jobs: server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Build (Snapshot) - if: ${{ !startsWith(github.ref, 'refs/tags/v') }} + if: ${{ !startsWith(github.ref, 'refs/tags/v') && matrix.ssl == 'ssl1' }} shell: bash run: | source ./scripts/continuous-integration/github-workflows/deploy-snapshot.sh @@ -64,6 +67,7 @@ jobs: shell: bash run: | echo "REVISION: $REVISION" + echo "SSL_TYPE: $SSL_TYPE" source ./scripts/continuous-integration/github-workflows/deploy-release.sh env: diff --git a/bom/pom.xml b/bom/pom.xml index 506139a..0b5a95c 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -3,20 +3,23 @@ 4.0.0 it.tdlight tdlight-java-bom - ${revision} + ${revision}${nativesSsl3Suffix}${revisionSuffix} pom TDLight Java BOM - - 1.0.0.0-SNAPSHOT - 293 - 291 - - 4.0.${nativesRevisionNumber}${nativesRevisionSuffix} - - 4.0.${apiRevisionNumber}${apiRevisionSuffix} - 1.8 - 1.8 - + + 1.0.0.0 + -SNAPSHOT + 299 + 297 + + + 4.0.${nativesRevisionNumber}${nativesRevisionSuffix} + 4.0.${nativesRevisionNumber}${nativesSsl3Suffix}${nativesRevisionSuffix} + + 4.0.${apiRevisionNumber}${apiRevisionSuffix} + 1.8 + 1.8 + mchv-release @@ -106,12 +109,12 @@ it.tdlight tdlight-natives-linux-amd64 - ${tdlight.natives.version} + ${tdlight.natives.ssl3.version} it.tdlight tdlight-natives-linux-aarch64 - ${tdlight.natives.version} + ${tdlight.natives.ssl3.version} it.tdlight diff --git a/scripts/core/deploy_release.sh b/scripts/core/deploy_release.sh index 10d5014..e00a503 100755 --- a/scripts/core/deploy_release.sh +++ b/scripts/core/deploy_release.sh @@ -1,17 +1,28 @@ #!/bin/bash -e # OTHER REQUIRED ENVIRONMENT VARIABLES: # REVISION = +# SSL_TYPE = # Check variables correctness if [ -z "${REVISION}" ]; then echo "Missing parameter: REVISION" exit 1 fi +# Check variables correctness +if [ -z "${SSL_TYPE}" ]; then + echo "Missing parameter: SSL_TYPE" + exit 1 +fi + +SSL_SUFFIX="" +if [[ "$SSL_TYPE" == "ssl3" ]]; then + SSL_SUFFIX="-ssl3" +fi cd "../../" cd "bom" -mvn -B -Drevision="${REVISION}" clean deploy +mvn -B -Drevision="${REVISION}" -DrevisionSuffix="" -DnativesSsl3Suffix="${SSL_SUFFIX}" clean deploy cd "../" echo "Done."