Skip to content

Commit

Permalink
Use fabric-composer-app rather than deploy keys for Git push
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Stone committed Mar 15, 2017
1 parent 953e868 commit b2538be
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions .travis/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fi

# are we building the docs?
if [ "${DOCS}" != "" ]; then
if [ -z "${TRAVIS_TAG}" ]; then
if [ -z "${TRAVIS_TAG}" ]; then
DOCS="full"
else
DOCS="unstable"
Expand All @@ -51,8 +51,8 @@ npm config set registry https://registry.npmjs.org/
npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}

# Set the GitHub deploy key we will use to publish.
set-up-ssh --key "$encrypted_568b95f14ac3_key" \
--iv "$encrypted_568b95f14ac3_iv" \
set-up-ssh --key "$encrypted_8496d53a6fac_key" \
--iv "$encrypted_8496d53a6fac_iv" \
--path-encrypted-key ".travis/github_deploy_key.enc"

# Change from HTTPS to SSH.
Expand Down Expand Up @@ -147,8 +147,8 @@ else
popd

# Configure the Git repository and clean any untracked and unignored build files.
git config user.name "Travis CI"
git config user.email "[email protected]"
git config user.name "${GH_USER_NAME}"
git config user.email "${GH_USER_EMAIL}"
git checkout -b master
git reset --hard
git clean -d -f
Expand Down
16 changes: 8 additions & 8 deletions .travis/deploy_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ set -o pipefail
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
date
# Set the GitHub deploy key we will use to publish.
set-up-ssh --key "$encrypted_f19708b15817_key" \
--iv "$encrypted_f19708b15817_iv" \
--path-encrypted-key ".travis/github_deploy_docs_key.enc"
set-up-ssh --key "$encrypted_8496d53a6fac_key" \
--iv "$encrypted_8496d53a6fac_iv" \
--path-encrypted-key ".travis/github_deploy_key.enc"

# push the html documents
# Configure the Git repository and clean any untracked and unignored build files.
git config user.name "Travis CI"
git config user.email "[email protected]"
git config user.name "${GH_USER_NAME}"
git config user.email "${GH_USER_EMAIL}"
git config push.default simple

echo ${DIR}
Expand All @@ -27,15 +27,15 @@ git clone [email protected]:fabric-composer/${REPO}.git
git remote set-url origin ${REPO}.git

cd "${DIR}/packages/composer-website/out/${REPO}"

if [ "${DOCS}" == "full" ]; then
rm -rf ${DIR}/packages/composer-website/out/${REPO}/*
cp -rf ${DIR}/packages/composer-website/jekylldocs/_site/* .
cp -rf ${DIR}/packages/composer-website/jekylldocs/_site/* .
fi

mkdir -p ${DIR}/packages/composer-website/out/${REPO}/unstable
rm -rf ${DIR}/packages/composer-website/out/${REPO}/unstable/*
cp -rf ${DIR}/packages/composer-website/jekylldocs/_site/* ./unstable
cp -rf ${DIR}/packages/composer-website/jekylldocs/_site/* ./unstable

git add .

Expand Down
Binary file removed .travis/github_deploy_docs_key.enc
Binary file not shown.
Binary file modified .travis/github_deploy_key.enc
Binary file not shown.

0 comments on commit b2538be

Please sign in to comment.