Update ci

This commit is contained in:
Andrea Cavalli 2023-05-09 12:15:15 +02:00
parent 08943e8782
commit 77d0770a59
2 changed files with 42 additions and 30 deletions

View File

@ -31,7 +31,7 @@ jobs:
- name: Get version - name: Get version
run: | run: |
set -eo pipefail set -xeo pipefail
# Get latest commit short hash # Get latest commit short hash
HASH_VERSION=$(git rev-parse --short HEAD) HASH_VERSION=$(git rev-parse --short HEAD)
@ -116,7 +116,7 @@ jobs:
- name: Install custom dependencies - name: Install custom dependencies
shell: bash shell: bash
run: | run: |
set -eo pipefail set -xeo pipefail
echo "REVISION: $REVISION" echo "REVISION: $REVISION"
if [[ -f "./.github/workflows/scripts/install-deps-${SAFE_TYPE}.sh" ]]; then if [[ -f "./.github/workflows/scripts/install-deps-${SAFE_TYPE}.sh" ]]; then
@ -168,13 +168,13 @@ jobs:
- name: Install vcpkg deps - name: Install vcpkg deps
if: matrix.os == 'windows-2019' if: matrix.os == 'windows-2019'
run: | run: |
set -eo pipefail set -xeo pipefail
$VCPKG_DIR/vcpkg install gperf openssl:x64-windows-static zlib:x64-windows-static $VCPKG_DIR/vcpkg install gperf openssl:x64-windows-static zlib:x64-windows-static
shell: bash shell: bash
- name: Build - name: Build
shell: bash shell: bash
run: | run: |
set -eo pipefail set -xeo pipefail
echo "REVISION: $REVISION" echo "REVISION: $REVISION"
source ./.github/workflows/scripts/build-${SAFE_TYPE}.sh source ./.github/workflows/scripts/build-${SAFE_TYPE}.sh
@ -186,27 +186,30 @@ jobs:
if: github.ref == 'refs/heads/develop' if: github.ref == 'refs/heads/develop'
shell: bash shell: bash
run: | run: |
set -eo pipefail set -xeo pipefail
echo "REVISION: $REVISION" echo "REVISION: $REVISION"
echo "TYPE: $TYPE" echo "TYPE: $TYPE"
mvn -B -f natives/pom.xml -Drevision="$REVISION" -Dnative.type.classifier="$TYPE" clean package mvn -B -f natives/pom.xml -Drevision="$REVISION" -Dnative.type.classifier="$TYPE" clean package
mvn org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv-snapshot \ mvn -B org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv-snapshot \
-DrepositoryId=mchv-snapshot-distribution \ -DrepositoryId=mchv-snapshot-distribution \
-Dfile=natives/target-$TYPE/tdlight-natives-$REVISION-$TYPE.jar \ -Dfile=natives/target-$TYPE/tdlight-natives-$REVISION-$TYPE.jar \
-DpomFile=natives/pom.xml \ -Dpackaging=pom \
-DgroupId=it.tdlight \
-DartifactId=tdlight-natives \
-Dversion=$REVISION \
-Drevision=$REVISION \
-Dclassifier=$TYPE \ -Dclassifier=$TYPE \
-Drevision="$REVISION" \
-Dnative.type.classifier="$TYPE" -Dnative.type.classifier="$TYPE"
if [[ "$TYPE" == "linux-amd64-ssl1"]]; then if [[ "$TYPE" == "linux-amd64-ssl1"]]; then
mvn org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv-snapshot \ mvn -B org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv-snapshot \
-DrepositoryId=mchv-snapshot-distribution \ -DrepositoryId=mchv-snapshot-distribution \
-Dfile=natives/.ci-friendly-pom.xml \ -Dfile=natives/.ci-friendly-pom.xml \
-Dpackaging=pom \ -Dpackaging=pom \
-DgroupId=it.tdlight \ -DgroupId=it.tdlight \
-DartifactId=tdlight-natives \ -DartifactId=tdlight-natives \
-Dversion=$REVISION \ -Dversion=$REVISION \
-Drevision="$REVISION" \ -Drevision=$REVISION \
-Dnative.type.classifier="$TYPE" -Dnative.type.classifier="$TYPE"
fi fi
@ -219,27 +222,30 @@ jobs:
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
shell: bash shell: bash
run: | run: |
set -eo pipefail set -xeo pipefail
echo "REVISION: $REVISION" echo "REVISION: $REVISION"
echo "TYPE: $TYPE" echo "TYPE: $TYPE"
mvn -B -f natives/pom.xml -Drevision="$REVISION" -Dnative.type.classifier="$TYPE" clean package mvn -B -f natives/pom.xml -Drevision="$REVISION" -Dnative.type.classifier="$TYPE" clean package
mvn org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv \ mvn -B org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv \
-DrepositoryId=mchv-release-distribution \ -DrepositoryId=mchv-release-distribution \
-Dfile=natives/target-$TYPE/tdlight-natives-$REVISION-$TYPE.jar \ -Dfile=natives/target-$TYPE/tdlight-natives-$REVISION-$TYPE.jar \
-DpomFile=natives/pom.xml \ -Dpackaging=pom \
-DgroupId=it.tdlight \
-DartifactId=tdlight-natives \
-Dversion=$REVISION \
-Drevision=$REVISION \
-Dclassifier=$TYPE \ -Dclassifier=$TYPE \
-Drevision="$REVISION" \
-Dnative.type.classifier="$TYPE" -Dnative.type.classifier="$TYPE"
if [[ "$TYPE" == "linux-amd64-ssl1"]]; then if [[ "$TYPE" == "linux-amd64-ssl1"]]; then
mvn org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv \ mvn -B org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv \
-DrepositoryId=mchv-release-distribution \ -DrepositoryId=mchv-release-distribution \
-Dfile=natives/.ci-friendly-pom.xml \ -Dfile=natives/.ci-friendly-pom.xml \
-Dpackaging=pom \ -Dpackaging=pom \
-DgroupId=it.tdlight \ -DgroupId=it.tdlight \
-DartifactId=tdlight-natives \ -DartifactId=tdlight-natives \
-Dversion=$REVISION \ -Dversion=$REVISION \
-Drevision="$REVISION" \ -Drevision=$REVISION \
-Dnative.type.classifier="$TYPE" -Dnative.type.classifier="$TYPE"
fi fi

View File

@ -52,7 +52,7 @@ jobs:
- name: Setup variables - name: Setup variables
shell: bash shell: bash
run: | run: |
set -eo pipefail set -xeo pipefail
# ====== Variables # ====== Variables
export REVISION=${{ github.run_number }} export REVISION=${{ github.run_number }}
export GH_MATRIX_OS=${{ matrix.os }} export GH_MATRIX_OS=${{ matrix.os }}
@ -70,7 +70,7 @@ jobs:
- name: Build - name: Build
shell: bash shell: bash
run: | run: |
set -eo pipefail set -xeo pipefail
echo "REVISION: $REVISION" echo "REVISION: $REVISION"
./.github/workflows/scripts/build-api.sh ./.github/workflows/scripts/build-api.sh
@ -86,19 +86,22 @@ jobs:
if: github.ref != 'refs/heads/master' if: github.ref != 'refs/heads/master'
shell: bash shell: bash
run: | run: |
set -eo pipefail set -xeo pipefail
echo "REVISION: $REVISION" echo "REVISION: $REVISION"
echo "Building standard package" echo "Building standard package"
mvn -f api/pom.xml clean package deploy -Drevision="$REVISION" mvn -B -f api/pom.xml clean package deploy -Drevision="$REVISION"
echo "Deploying legacy package" echo "Deploying legacy package"
mvn -f api/pom.xml clean package -Dlegacy=true -Drevision="$REVISION" mvn -B -f api/pom.xml clean package -Dlegacy=true -Drevision="$REVISION"
mvn org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv-snapshot \ mvn -B org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv-snapshot \
-DrepositoryId=mchv-snapshot-distribution \ -DrepositoryId=mchv-snapshot-distribution \
-Dfile=api/target-legacy/tdlight-api-$REVISION-legacy.jar \ -Dfile=api/target-legacy/tdlight-api-$REVISION-legacy.jar \
-DpomFile=api/pom.xml \ -Dpackaging=pom \
-DgroupId=it.tdlight \
-DartifactId=tdlight-api \
-Dversion=$REVISION \
-Drevision=$REVISION \
-Dclassifier=legacy \ -Dclassifier=legacy \
-Drevision="$REVISION" \
-Dlegacy=true -Dlegacy=true
env: env:
MAVEN_USERNAME: ${{ secrets.MCHV_USERNAME }} MAVEN_USERNAME: ${{ secrets.MCHV_USERNAME }}
@ -107,20 +110,23 @@ jobs:
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
shell: bash shell: bash
run: | run: |
set -eo pipefail set -xeo pipefail
echo "REVISION: $REVISION" echo "REVISION: $REVISION"
echo "Deploying standard package" echo "Deploying standard package"
mvn -f api/pom.xml clean package deploy -Drevision="$REVISION" mvn -B -f api/pom.xml clean package deploy -Drevision="$REVISION"
echo "Deploying legacy package" echo "Deploying legacy package"
mvn -f api/pom.xml clean package -Dlegacy=true -Drevision="$REVISION" mvn -B -f api/pom.xml clean package -Dlegacy=true -Drevision="$REVISION"
mvn org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv \ mvn -B org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv \
-DrepositoryId=mchv-release-distribution \ -DrepositoryId=mchv-release-distribution \
-Dfile=api/target-legacy/tdlight-api-$REVISION-legacy.jar \ -Dfile=api/target-legacy/tdlight-api-$REVISION-legacy.jar \
-DpomFile=api/pom.xml \ -Dpackaging=pom \
-DgroupId=it.tdlight \
-DartifactId=tdlight-api \
-Dversion=$REVISION \
-Drevision=$REVISION \
-Dclassifier=legacy \ -Dclassifier=legacy \
-Drevision="$REVISION" \
-Dlegacy=true -Dlegacy=true