Skip to content

Commit 2dde6e6

Browse files
Merge pull request #814 from johnmcfarlane/ci-update
More CI updates
2 parents 4bee484 + 437d0c8 commit 2dde6e6

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

.github/deploy

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ git checkout gh-pages
5353
git add .
5454
if git commit \
5555
--amend \
56-
--message="Documentation v${CNL_VERSION}-${CNL_CHANNEL}"
56+
--message="Documentation v${CNL_VERSION}-${CNL_CHANNEL}" \
57+
--reset-author
5758
then
5859
git push --force
5960
fi
@@ -64,5 +65,8 @@ popd
6465
conan remote add johnmcfarlane/cnl https://api.bintray.com/conan/johnmcfarlane/cnl
6566
conan user -p "${CONAN_PASS}" -r johnmcfarlane/cnl "${CONAN_USER}"
6667
conan install --build=missing "${PROJECT_DIR}"
67-
conan create "${PROJECT_DIR}" "cnl/${CNL_VERSION}@johnmcfarlane/${CNL_CHANNEL}"
68+
conan create \
69+
--ignore-dirty \
70+
"${PROJECT_DIR}" \
71+
"cnl/${CNL_VERSION}@johnmcfarlane/${CNL_CHANNEL}"
6872
conan upload "cnl/${CNL_VERSION}@johnmcfarlane/${CNL_CHANNEL}" -r johnmcfarlane/cnl

0 commit comments

Comments
 (0)