Skip to content

Commit

Permalink
Merge pull request #307 from alphaville/dev/autodoc
Browse files Browse the repository at this point in the history
Fix: Trigger autodoc build when merging into master
  • Loading branch information
alphaville authored Nov 29, 2022
2 parents 2b2ffb9 + 379fd14 commit 0c0acae
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
15 changes: 6 additions & 9 deletions ci/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
set -euxo pipefail

function run_clippy_test() {
cd $1
pushd $1
cargo clippy --all-targets --all-features
if [ -d "./tcp_iface_$1" ]
then
# Test auto-generated TCP interface
cd ./tcp_iface_$1
pushd ./tcp_iface_$1
cargo clippy --all-targets --all-features
cd ..
popd
fi
if [ -d "./icasadi_$1" ]
then
# Test auto-generated CasADi interface
cd icasadi_$1
pushd icasadi_$1
cargo clippy --all-targets --all-features
cd ..
popd
fi
cd ..
popd
}

regular_test() {
Expand All @@ -44,9 +44,6 @@ regular_test() {
# --- install opengen
pip install .

# --- uncomment to run main file
# python main.py

# --- run the tests
export PYTHONPATH=.
python -W ignore test/test_constraints.py -v
Expand Down
2 changes: 1 addition & 1 deletion ci/sphinx-documentation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ echo "COMMIT HASH :" $commit_hash
# If the current branch is not master and the current commit
# message does not contain [docit], then stop
magic_docs_keyword="[docit]"
if [[ "$commit_message" != *"$magic_docs_keyword"* ]] && [ "$current_branch" == "master" ]; then
if [[ "$commit_message" != *"$magic_docs_keyword"* ]] && [ "$current_branch" != "master" ]; then
echo "The commit message does not contain [docit] and this is not the master branch /exiting! bye :)";
exit 0;
fi
Expand Down

0 comments on commit 0c0acae

Please sign in to comment.