tdlight-team/tdlight-java
tdlight-team/tdlight-java
1
2
Fork 0
Code Issues Releases Wiki Activity

Update deploy_master.sh and win.sh

Browse Source
This commit is contained in:
Andrea Cavalli 2020-08-18 20:08:49 +02:00
parent 566501501b
commit 7f6de477d3
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
travis/deploy_master.sh
View File

@ -19,11 +19,7 @@ echo "TRAVIS_CPU_ARCH_STANDARD: $TRAVIS_CPU_ARCH_STANDARD"
# Setup ssh
mkdir -p ~/.ssh
if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
echo "$GIT_IGN_TRAVIS_DEPLOY_PRIVATE_KEY" | base64.exe -d > ~/.ssh/id_rsa
else
echo "$GIT_IGN_TRAVIS_DEPLOY_PRIVATE_KEY" | base64 -d > ~/.ssh/id_rsa
fi
echo "$GIT_IGN_TRAVIS_DEPLOY_PRIVATE_KEY" | base64 -d > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa || true
ssh-keyscan ssh.git.ignuranza.net >> $HOME/.ssh/known_hosts
ssh-keyscan git.ignuranza.net >> $HOME/.ssh/known_hosts
@ -39,19 +35,15 @@ if [ "$TRAVIS_OS_NAME_STANDARD" = "windows" ]; then
mkdir -p "src/main/resources/libs/$TRAVIS_OS_NAME_STANDARD/$TRAVIS_CPU_ARCH_STANDARD"
mv "$TRAVIS_BUILD_DIR/out/libtdjni.dll" "src/main/resources/libs/$TRAVIS_OS_NAME_STANDARD/$TRAVIS_CPU_ARCH_STANDARD/tdjni.dll"
git add "src/main/resources/libs/$TRAVIS_OS_NAME_STANDARD/$TRAVIS_CPU_ARCH_STANDARD/tdjni.dll"
/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3-bin/bin/mvn.cmd build-helper:parse-version versions:set \
-DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} \
versions:commit
NEW_VERSION=$(/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3-bin/bin/mvn.cmd help:evaluate -Dexpression=project.version -q -DforceStdout)
else
mkdir -p "src/main/resources/libs/$TRAVIS_OS_NAME_STANDARD/$TRAVIS_CPU_ARCH_STANDARD"
mv "$TRAVIS_BUILD_DIR/out/libtdjni.so" "src/main/resources/libs/$TRAVIS_OS_NAME_STANDARD/$TRAVIS_CPU_ARCH_STANDARD/tdjni.so"
git add "src/main/resources/libs/$TRAVIS_OS_NAME_STANDARD/$TRAVIS_CPU_ARCH_STANDARD/tdjni.so"
mvn build-helper:parse-version versions:set \
-DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} \
versions:commit
NEW_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
fi
mvn build-helper:parse-version versions:set \
-DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} \
versions:commit
NEW_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
git add pom.xml
git commit -m "Updated native library"
git tag -a "v$NEW_VERSION" -m "Version $NEW_VERSION"

12
travis/win.sh
View File

@ -4,15 +4,7 @@ mkdir $TRAVIS_BUILD_DIR/out
# Build deps
choco install openjdk11
choco install maven
echo $M2_HOME
ls -alch /c/ProgramData/chocolatey/lib
ls -alch /c/ProgramData/chocolatey/lib/maven
ls -alch /c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3-bin
ls -alch /c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3-bin/bin
ls -alch /c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3-bin/bin/mvn.cmd
choco install maven --version=3.6.3
choco install base64
touch "$TRAVIS_BUILD_DIR/out/libtdjni.dll"
@ -23,7 +15,7 @@ choco install gperf
choco install strawberryperl
# Setup variables
export PATH=$PATH:/c/ProgramData/chocolatey/lib/maven/bin:/c/ProgramData/chocolatey/lib/base64/tools
export PATH=$PATH:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/base64/tools
# End setup variables
cd $TRAVIS_BUILD_DIR