Add ssl3 support
This commit is contained in:
parent
2f3f76abea
commit
8c040112f4
|
@ -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:
|
||||
|
|
31
bom/pom.xml
31
bom/pom.xml
|
@ -3,20 +3,23 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>it.tdlight</groupId>
|
||||
<artifactId>tdlight-java-bom</artifactId>
|
||||
<version>${revision}</version>
|
||||
<version>${revision}${nativesSsl3Suffix}${revisionSuffix}</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>TDLight Java BOM</name>
|
||||
<properties>
|
||||
<revision>1.0.0.0-SNAPSHOT</revision>
|
||||
<nativesRevisionNumber>293</nativesRevisionNumber>
|
||||
<apiRevisionNumber>291</apiRevisionNumber>
|
||||
<nativesRevisionSuffix/>
|
||||
<tdlight.natives.version>4.0.${nativesRevisionNumber}${nativesRevisionSuffix}</tdlight.natives.version>
|
||||
<apiRevisionSuffix/>
|
||||
<tdlight.api.version>4.0.${apiRevisionNumber}${apiRevisionSuffix}</tdlight.api.version>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
</properties>
|
||||
<properties>
|
||||
<revision>1.0.0.0</revision>
|
||||
<revisionSuffix>-SNAPSHOT</revisionSuffix>
|
||||
<nativesRevisionNumber>299</nativesRevisionNumber>
|
||||
<apiRevisionNumber>297</apiRevisionNumber>
|
||||
<nativesRevisionSuffix/>
|
||||
<nativesSsl3Suffix/>
|
||||
<tdlight.natives.version>4.0.${nativesRevisionNumber}${nativesRevisionSuffix}</tdlight.natives.version>
|
||||
<tdlight.natives.ssl3.version>4.0.${nativesRevisionNumber}${nativesSsl3Suffix}${nativesRevisionSuffix}</tdlight.natives.ssl3.version>
|
||||
<apiRevisionSuffix/>
|
||||
<tdlight.api.version>4.0.${apiRevisionNumber}${apiRevisionSuffix}</tdlight.api.version>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
</properties>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>mchv-release</id>
|
||||
|
@ -106,12 +109,12 @@
|
|||
<dependency>
|
||||
<groupId>it.tdlight</groupId>
|
||||
<artifactId>tdlight-natives-linux-amd64</artifactId>
|
||||
<version>${tdlight.natives.version}</version>
|
||||
<version>${tdlight.natives.ssl3.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>it.tdlight</groupId>
|
||||
<artifactId>tdlight-natives-linux-aarch64</artifactId>
|
||||
<version>${tdlight.natives.version}</version>
|
||||
<version>${tdlight.natives.ssl3.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>it.tdlight</groupId>
|
||||
|
|
|
@ -1,17 +1,28 @@
|
|||
#!/bin/bash -e
|
||||
# OTHER REQUIRED ENVIRONMENT VARIABLES:
|
||||
# REVISION = <revision>
|
||||
# SSL_TYPE = <ssl1|ssl3>
|
||||
|
||||
# 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."
|
||||
|
|
Loading…
Reference in New Issue