Fix deployment

This commit is contained in:
Andrea Cavalli 2023-05-09 11:19:45 +02:00
parent 7d4fcbb148
commit 8098add2ae
2 changed files with 12 additions and 6 deletions

View File

@ -188,9 +188,12 @@ jobs:
run: | run: |
set -eo pipefail set -eo pipefail
echo "REVISION: $REVISION" 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: env:
MAVEN_USERNAME: ${{ secrets.MCHV_USERNAME }} MAVEN_USERNAME: ${{ secrets.MCHV_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MCHV_TOKEN }} MAVEN_PASSWORD: ${{ secrets.MCHV_TOKEN }}
@ -200,9 +203,12 @@ jobs:
run: | run: |
set -eo pipefail set -eo pipefail
echo "REVISION: $REVISION" 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: env:
MAVEN_USERNAME: ${{ secrets.MCHV_USERNAME }} MAVEN_USERNAME: ${{ secrets.MCHV_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MCHV_TOKEN }} MAVEN_PASSWORD: ${{ secrets.MCHV_TOKEN }}

View File

@ -81,7 +81,7 @@ jobs:
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: tdlight-api-${{env.REVISION}}-legacy.jar 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) - name: Deploy to Maven (Snapshot)
if: github.ref != 'refs/heads/master' if: github.ref != 'refs/heads/master'
shell: bash shell: bash
@ -116,7 +116,7 @@ jobs:
mvn -f api/pom.xml clean package -Dlegacy=true -Drevision="$REVISION" 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 \ mvn 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/tdlight-api-$REVISION-legacy.jar \ -Dfile=api/target-legacy/tdlight-api-$REVISION-legacy.jar \
-DpomFile=api/pom.xml \ -DpomFile=api/pom.xml \
-Dclassifier=bin \ -Dclassifier=bin \
-Drevision="$REVISION" -Drevision="$REVISION"