Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the merge workflow #371

Merged
merged 2 commits into from
Mar 25, 2024
Merged

Fix the merge workflow #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c17914
attempt to fix the merge workflow
maximlt Mar 24, 2024
3de13f9
dummy change
maximlt Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ jobs:
git commit -m "Add $CHANGEDPROJECTS"
git log -n 10 --oneline
echo "Push changes to evaluated"
git push HEAD:evaluated
git push origin HEAD:evaluated
echo "Delete the dev evaluated branch $DEVBRANCH"
git push --delete $DEVBRANCH
git checkout main
Expand All @@ -204,7 +204,7 @@ jobs:
git commit -m "Remove $REMOVEDPROJECTS"
git log -n 10 --oneline
echo "Push changes to evaluated"
git push HEAD:evaluated
git push origin HEAD:evaluated
fi
- name: checkout evaluated
# any event that isn't workflow_call (coming from pr_flow.yml)
Expand Down
1 change: 1 addition & 0 deletions gull_tracking/anaconda-project.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ commands:

variables: {}


downloads:
DATAFILE:
url: https://s3.eu-west-1.amazonaws.com/datasets.holoviz.org/HG_OOSTENDE/v1/HG_OOSTENDE-gps-2018.csv
Expand Down
Loading