Update deploy_master.sh and win.sh
This commit is contained in:
parent
566501501b
commit
7f6de477d3
@ -19,11 +19,7 @@ echo "TRAVIS_CPU_ARCH_STANDARD: $TRAVIS_CPU_ARCH_STANDARD"
|
|||||||
|
|
||||||
# Setup ssh
|
# Setup ssh
|
||||||
mkdir -p ~/.ssh
|
mkdir -p ~/.ssh
|
||||||
if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
|
echo "$GIT_IGN_TRAVIS_DEPLOY_PRIVATE_KEY" | base64 -d > ~/.ssh/id_rsa
|
||||||
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
|
|
||||||
chmod 600 ~/.ssh/id_rsa || true
|
chmod 600 ~/.ssh/id_rsa || true
|
||||||
ssh-keyscan ssh.git.ignuranza.net >> $HOME/.ssh/known_hosts
|
ssh-keyscan ssh.git.ignuranza.net >> $HOME/.ssh/known_hosts
|
||||||
ssh-keyscan 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"
|
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"
|
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"
|
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
|
else
|
||||||
mkdir -p "src/main/resources/libs/$TRAVIS_OS_NAME_STANDARD/$TRAVIS_CPU_ARCH_STANDARD"
|
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"
|
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"
|
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
|
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 add pom.xml
|
||||||
git commit -m "Updated native library"
|
git commit -m "Updated native library"
|
||||||
git tag -a "v$NEW_VERSION" -m "Version $NEW_VERSION"
|
git tag -a "v$NEW_VERSION" -m "Version $NEW_VERSION"
|
||||||
|
@ -4,15 +4,7 @@ mkdir $TRAVIS_BUILD_DIR/out
|
|||||||
|
|
||||||
# Build deps
|
# Build deps
|
||||||
choco install openjdk11
|
choco install openjdk11
|
||||||
choco install maven
|
choco install maven --version=3.6.3
|
||||||
|
|
||||||
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 base64
|
choco install base64
|
||||||
|
|
||||||
touch "$TRAVIS_BUILD_DIR/out/libtdjni.dll"
|
touch "$TRAVIS_BUILD_DIR/out/libtdjni.dll"
|
||||||
@ -23,7 +15,7 @@ choco install gperf
|
|||||||
choco install strawberryperl
|
choco install strawberryperl
|
||||||
|
|
||||||
# Setup variables
|
# 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
|
# End setup variables
|
||||||
|
|
||||||
cd $TRAVIS_BUILD_DIR
|
cd $TRAVIS_BUILD_DIR
|
||||||
|
Loading…
Reference in New Issue
Block a user