diff options
| author | Carlos Konstanski <carlos.konstanski@olo.com> | 2025-10-07 07:39:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-07 07:39:02 -0600 |
| commit | 76e83a2826b410545dd6e8ce40fb704355698b60 (patch) | |
| tree | 2a774c65e8c6dab67fceacb744f7c8f91b825ce6 | |
| parent | 35aea466c09492afa02d87059aedf06cdb20c553 (diff) | |
| parent | 51177f5136a4db18b16afcd0bdb0cd3c94d5a7c4 (diff) | |
Merge pull request #3 from ololabs/last-initial-commit
last initial commit
| -rw-r--r-- | ci/.gitignore | 2 | ||||
| -rw-r--r-- | ci/docker-compose.yaml.example (renamed from ci/docker-compose.yaml) | 3 | ||||
| -rw-r--r-- | lisp/git/git.lisp | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/ci/.gitignore b/ci/.gitignore index 7ca3a5c..416ae59 100644 --- a/ci/.gitignore +++ b/ci/.gitignore @@ -1,2 +1,2 @@ tmp -docker-start.tar.xz +docker-compose.yaml diff --git a/ci/docker-compose.yaml b/ci/docker-compose.yaml.example index 930ed8b..b9192a2 100644 --- a/ci/docker-compose.yaml +++ b/ci/docker-compose.yaml.example @@ -16,6 +16,9 @@ services: source: /tmp/snow target: /tmp/snow - type: bind + source: ${OLO_PROJECT_HOME} + target: ${OLO_PROJECT_HOME} + - type: bind source: ~/.aws target: /home/${OLO_USERNAME}/.aws - type: bind diff --git a/lisp/git/git.lisp b/lisp/git/git.lisp index 403c25e..1aa8eb0 100644 --- a/lisp/git/git.lisp +++ b/lisp/git/git.lisp @@ -91,7 +91,7 @@ (when (= return-code 0) (format stream (shell-wrapper-as-string fetch-command)) (let ((branch (string-trim '(#\Space #\Tab #\Newline) (shell-wrapper-as-string branch-command)))) - (if (position branch '("main" "develop" "master") :test 'string=) + (if (position branch '("main" "develop" "development" "master") :test 'string=) (progn (format stream "Updating repo ~a on branch ~a~%" dir branch) (format stream (shell-wrapper-as-string (format nil "cd ~a/~a ; git pull origin ~a" (pwd git-update-task) dir branch)))) |