From 8098add2ae8e44bbb20fb85c8e42a4f585423536 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Tue, 9 May 2023 11:19:45 +0200 Subject: [PATCH] Fix deployment --- .github/workflows/platform_natives.yaml | 14 ++++++++++---- .github/workflows/tdapi_file.yaml | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/platform_natives.yaml b/.github/workflows/platform_natives.yaml index f26369d..ae2d12a 100644 --- a/.github/workflows/platform_natives.yaml +++ b/.github/workflows/platform_natives.yaml @@ -188,9 +188,12 @@ jobs: run: | set -eo pipefail echo "REVISION: $REVISION" - echo "SSL TYPE: $SSL_TYPE" + echo "TYPE: $TYPE" - source ./scripts/continuous-integration/github-workflows/deploy-snapshot.sh + mvn -B -f natives/pom.xml -Drevision="$REVISION" -Dnative.type.classifier="$TYPE" clean package deploy + + echo "Done." + exit 0 env: MAVEN_USERNAME: ${{ secrets.MCHV_USERNAME }} MAVEN_PASSWORD: ${{ secrets.MCHV_TOKEN }} @@ -200,9 +203,12 @@ jobs: run: | set -eo pipefail echo "REVISION: $REVISION" - echo "SSL TYPE: $SSL_TYPE" + echo "TYPE: $TYPE" - source ./scripts/continuous-integration/github-workflows/deploy-release.sh + mvn -B -f natives/pom.xml -Drevision="$REVISION" -Dnative.type.classifier="$TYPE" clean package deploy + + echo "Done." + exit 0 env: MAVEN_USERNAME: ${{ secrets.MCHV_USERNAME }} MAVEN_PASSWORD: ${{ secrets.MCHV_TOKEN }} diff --git a/.github/workflows/tdapi_file.yaml b/.github/workflows/tdapi_file.yaml index a22ea22..e724683 100644 --- a/.github/workflows/tdapi_file.yaml +++ b/.github/workflows/tdapi_file.yaml @@ -81,7 +81,7 @@ jobs: - uses: actions/upload-artifact@v3 with: name: tdlight-api-${{env.REVISION}}-legacy.jar - path: api/target/tdlight-api-${{env.REVISION}}-legacy.jar + path: api/target-legacy/tdlight-api-${{env.REVISION}}-legacy.jar - name: Deploy to Maven (Snapshot) if: github.ref != 'refs/heads/master' shell: bash @@ -116,7 +116,7 @@ jobs: mvn -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 \ -DrepositoryId=mchv-release-distribution \ - -Dfile=api/target/tdlight-api-$REVISION-legacy.jar \ + -Dfile=api/target-legacy/tdlight-api-$REVISION-legacy.jar \ -DpomFile=api/pom.xml \ -Dclassifier=bin \ -Drevision="$REVISION"