Skip to content

Commit

Permalink
Merge branch 'main' into compliance_lsystems
Browse files Browse the repository at this point in the history
  • Loading branch information
maximlt authored Nov 1, 2023
2 parents 617b18d + e23e6c0 commit 5b5bd03
Show file tree
Hide file tree
Showing 11 changed files with 967 additions and 40 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_one.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
fi
mkdir -p doc/gallery
git diff
git diff --name-only
if [ -d ./doc/gallery/$DIR ]; then rm -rf ./doc/gallery/$DIR; fi
mkdir ./doc/gallery/$DIR
mv ./tmp/* ./doc/gallery/$DIR
Expand All @@ -125,6 +125,6 @@ jobs:
- name: clean up
run: doit clean --clean-dep build:${{ inputs.project }}
- name: git diff
run: git diff
run: git diff --name-only
- name: check clean up
run: git diff --quiet --exit-code
10 changes: 5 additions & 5 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ jobs:
done
echo "Pull evaluated docs from the dev branch"
git checkout $DEVBRANCH -- doc/gallery/
git diff
git diff --name-only
git add './doc/gallery/'
git commit -m "Add $CHANGEDPROJECTS"
git log -n 10 --oneline
Expand Down Expand Up @@ -245,14 +245,14 @@ jobs:
# Checkout only the /doc/gallery folder than contains the evaluated artefacts
# we want to add to the evaluated branch, albeit just temporarily for this docs build
git checkout $DEVBRANCH -- doc/gallery/
git diff
git diff --name-only
# This isn't meant to be pushed, it's just for this docs build
git add './doc/gallery/'
git commit -m "Add $CHANGEDPROJECTS"
git checkout ${{ inputs.branch }}
# Checkout only the /doc/gallery folder than contains the evaluated artefacts
git checkout evaluated -- ./doc/gallery
git diff
git diff --name-only
git log -n 10 --oneline
tree doc/gallery -D -h
ls
Expand All @@ -277,13 +277,13 @@ jobs:
echo "Removed doc/gallery/$item"
git add './doc/gallery/$item'
done
git diff
git diff --name-only
# This isn't meant to be pushed, it's just for this docs build
git commit -m "Remove $REMOVEDPROJECTS"
git checkout ${{ inputs.branch }}
# Checkout only the /doc/gallery folder than contains the evaluated artefacts
git checkout evaluated -- ./doc/gallery
git diff
git diff --name-only
git log -n 10 --oneline
tree doc/gallery -D -h
ls
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_one.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,6 @@ jobs:
- name: complete clean up and diff
run: |
doit clean --clean-dep test
git diff
git diff --name-only
- name: Check clean up
run: git diff --quiet --exit-code
2 changes: 2 additions & 0 deletions landsat/anaconda-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ examples_config:
labels:
- geoviews
- datashader
deployments:
- command: notebook

user_fields: [examples_config]

Expand Down
Loading

0 comments on commit 5b5bd03

Please sign in to comment.