From c676cedb9ff89c8c2e0c8c52beb25b66ef6ba9d3 Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@3a-systems.ru>
Date: Thu, 20 Feb 2020 18:04:01 +0000
Subject: [PATCH] FIX distribution build (#102)
---
.travis.yml | 8 ++++----
commons | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 318daf2..aa8bfe9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@
- git config --local user.name "Open Identity Platform Community" && git config --local user.email "open-identity-platform-opendj@googlegroups.com"
- git checkout -f $TRAVIS_BRANCH
- git tag -f $git_version && git tag -d $git_version
- - mvn -q -B -DreleaseVersion="$git_version" -DignoreSnapshots=true -DpushChanges=false -DscmCommentPrefix="[ci skip] $git_version_last->$git_version " -DskipTests -Darguments=-DskipTests -Dresume=false -P distribution release:prepare
+ - mvn -B -DreleaseVersion="$git_version" -DignoreSnapshots=true -DpushChanges=false -DscmCommentPrefix="[ci skip] $git_version_last->$git_version " -DskipTests -Darguments=-DskipTests -Dresume=false -P distribution release:prepare
- git push --quiet --force https://$GITHUBKEY@github.com/$TRAVIS_REPO_SLUG.git >/dev/null 2>&1
- git push --quiet --force https://$GITHUBKEY@github.com/$TRAVIS_REPO_SLUG.git $git_version >/dev/null 2>&1
deploy:
@@ -63,8 +63,8 @@
- echo 'build and push Github Docker'
- docker login docker.pkg.github.com -u "$GITHUB_USERNAME" -p "$GITHUB_PASSWORD"
- docker build ./opendj-packages/opendj-docker -t docker.pkg.github.com/openidentityplatform/opendj/opendj -t docker.pkg.github.com/openidentityplatform/opendj/opendj:$git_version
- - #docker push docker.pkg.github.com/openidentityplatform/opendj/opendj:$git_version
- - #docker push docker.pkg.github.com/openidentityplatform/opendj/opendj
+ - docker push docker.pkg.github.com/openidentityplatform/opendj/opendj:$git_version
+ - docker push docker.pkg.github.com/openidentityplatform/opendj/opendj
- os: linux
jdk: oraclejdk11
- os: linux
@@ -88,7 +88,7 @@
before_install:
- date -u
- uname -a
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then brew install rpm && brew cask install wine-stable; else sudo apt-get install -y rpm wine; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then brew install rpm && brew cask install wine-stable; else sudo apt-get install -y rpm && sudo dpkg --add-architecture i386 && wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add - && sudo apt-add-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ xenial main' && sudo apt update && sudo apt install --install-recommends winehq-stable ; fi
- git fetch -t
- export git_version_last="$(git describe --abbrev=0 --tags)"
- export git_version="$(echo $git_version_last | awk -F . '{ printf "%d.%d.%d", $1,$2,$3 + 1}')"
diff --git a/commons b/commons
index 31fddce..47fad6d 160000
--- a/commons
+++ b/commons
@@ -1 +1 @@
-Subproject commit 31fddceab91ef710409d05278304def2a7673d8c
+Subproject commit 47fad6d69d4614af488d040e2b8048d05dcec614
--
Gitblit v1.10.0