Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

doc: Debug an issue where the documentation isn't generated properly (#3314) 

This is a test commit, it will be reverted partially or fully.
This commit is contained in:
Emmanuel Lepage Vallée 2021-04-04 23:27:40 -07:00 committed by GitHub
parent 3dddc2ba78
commit 747b14142f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build-utils/travis-apidoc.sh
View File

@ -95,18 +95,20 @@ Build URL: https://travis-ci.com/awesomeWM/awesome/builds/${TRAVIS_BUILD_ID}"
git commit -m "[relevant] $COMMIT_MSG" git commit -m "[relevant] $COMMIT_MSG"
# Commit the irrelevant changes. # Commit the irrelevant changes.
mv .git ../doc #FIXME April 2021: Some unknown change caused the line below to misbehave.
cd ../doc #FIXME Hopefully, this change will be reverted soon.
#FIXME mv .git ../doc
#FIXME cd ../doc
git add --all . git add --all .
git commit -m "[boilerplate] $COMMIT_MSG" git commit -m "[boilerplate] $COMMIT_MSG"
# Reorder/swap commits, to have "relevant" after "boilerplate". # Reorder/swap commits, to have "relevant" after "boilerplate".
# This makes it show up earlier in the Github interface etc. # This makes it show up earlier in the Github interface etc.
git tag _old #FIXME git tag _old
git reset --hard HEAD~2 #FIXME git reset --hard HEAD~2
git cherry-pick _old _old~1 #FIXME git cherry-pick _old _old~1
RELEVANT_REV="$(git rev-parse --short HEAD)" RELEVANT_REV="$(git rev-parse --short HEAD)"
git tag -d _old #FIXME git tag -d _old
git checkout "$BRANCH" git checkout "$BRANCH"
OLD_REV="$(git rev-parse --short HEAD)" OLD_REV="$(git rev-parse --short HEAD)"
@ -132,10 +134,15 @@ Tree: https://github.com/awesomeWM/awesome/commits/${LAST_COMMIT}"
fi fi
fi fi
git merge --no-ff -m "$MERGE_COMMIT_MSG" merged-update git merge --no-ff -m "$MERGE_COMMIT_MSG" merged-update
echo BEGIN DEBUG LOG
git log --graph | head -n 100
echo END DEBUG LOG
NEW_REV="$(git rev-parse --short HEAD)" NEW_REV="$(git rev-parse --short HEAD)"
git push origin "$BRANCH" 2>&1 | sed "s/$GH_APIDOC_TOKEN/GH_APIDOC_TOKEN/g" git push origin "$BRANCH" 2>&1 | sed "s/$GH_APIDOC_TOKEN/GH_APIDOC_TOKEN/g"
echo PUSHED WITH RET CODE $?
# Generate compare view links. # Generate compare view links.
# NOTE: use "\n" for line endings, not real ones for valid json! # NOTE: use "\n" for line endings, not real ones for valid json!
COMPARE_LINKS="Compare view: https://github.com/awesomeWM/apidoc/compare/${OLD_REV}...${NEW_REV}" COMPARE_LINKS="Compare view: https://github.com/awesomeWM/apidoc/compare/${OLD_REV}...${NEW_REV}"