Skip to content

Commit 4f000ae

Browse files
committed
MDLSITE-8135 Publish installer string files in appropriate location
1 parent 2596158 commit 4f000ae

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

jobs/install-packs-publish

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ prepare_branches() {
5252
git checkout --no-guess -b ${installbranch} --no-track upstream/${upstreambranch}
5353
fi
5454

55-
GIT_AUTHOR_NAME="AMOS bot" GIT_AUTHOR_EMAIL="[email protected]" GIT_COMMITTER_NAME="AMOS bot" GIT_COMMITTER_EMAIL="[email protected]" \
55+
GIT_AUTHOR_NAME="AMOS bot" GIT_AUTHOR_EMAIL="[email protected]" GIT_COMMITTER_NAME="AMOS bot" GIT_COMMITTER_EMAIL="[email protected]" \
5656
git merge ${upstreambranch}
5757
}
5858

@@ -65,15 +65,20 @@ prepare_branches() {
6565
commit_install_strings() {
6666
local dirname=$1
6767
local installbranch=$2
68+
local installroot="install"
6869

69-
cd ${REPO}
70-
git checkout ${installbranch}
70+
cd ${REPO}
71+
git checkout ${installbranch}
7172

72-
cd ${REPO}/install
73-
rm -rf lang
74-
cp -r ${AMOSDATAROOT}/export-install/${dirname}/install/lang .
75-
git add .
76-
GIT_AUTHOR_NAME="AMOS bot" GIT_AUTHOR_EMAIL="[email protected]" GIT_COMMITTER_NAME="AMOS bot" GIT_COMMITTER_EMAIL="[email protected]" \
73+
if [[ -d ${AMOSDATAROOT}/export-install/${dirname}/public ]]; then
74+
installroot="public/install"
75+
fi
76+
77+
cd ${REPO}/${installroot}
78+
rm -rf lang
79+
cp -r ${AMOSDATAROOT}/export-install/${dirname}/${installroot}/lang .
80+
git add .
81+
GIT_AUTHOR_NAME="AMOS bot" GIT_AUTHOR_EMAIL="[email protected]" GIT_COMMITTER_NAME="AMOS bot" GIT_COMMITTER_EMAIL="[email protected]" \
7782
git commit -a -m "Automatically generated installer lang files"
7883
}
7984

0 commit comments

Comments
 (0)