From 6c17914045d4b8149c2853bfcf901d14d2b28679 Mon Sep 17 00:00:00 2001 From: maximlt Date: Mon, 25 Mar 2024 00:45:43 +0100 Subject: [PATCH 1/2] attempt to fix the merge workflow --- .github/workflows/docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 67b9f4d50..9c2f1aa8f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -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 @@ -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) From 3de13f9212f57b47ef04dd644bc4827bb404ece9 Mon Sep 17 00:00:00 2001 From: maximlt Date: Mon, 25 Mar 2024 00:46:40 +0100 Subject: [PATCH 2/2] dummy change --- gull_tracking/anaconda-project.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/gull_tracking/anaconda-project.yml b/gull_tracking/anaconda-project.yml index bca95eb55..cf80940db 100644 --- a/gull_tracking/anaconda-project.yml +++ b/gull_tracking/anaconda-project.yml @@ -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