diff options
| -rw-r--r-- | .gitlab-ci.yml | 17 | ||||
| -rw-r--r-- | project.conf | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc056536..7fe4b91c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,7 @@ variables: .bst_before_script: &bst_before_script before_script: - | - export BST_SHA='b14a0c575991f3b75aa15b21b2652186b62d0a09' + export BST_SHA='3fd7fe1fd3406fc9c35d0d2719085809c48247c7' git clone https://gitlab.com/BuildStream/buildstream.git # Use specific version of BuildStream cd buildstream && git checkout $BST_SHA @@ -55,16 +55,15 @@ variables: # Trust the host key of the cache server. - ssh-keyscan -p 22200 ostree.baserock.org >> ~/.ssh/known_hosts - # Enable push and pull for Baserock artifact cache (default config is pull only) + # If we can push, then enable push and pull for Baserock artifact cache + # (default config is pull only) - | - mkdir -p ~/.config - echo "projects:" > ~/.config/buildstream.conf - echo " baserock:" >> ~/.config/buildstream.conf - echo " artifacts:" >> ~/.config/buildstream.conf - echo " pull-url: https://ostree.baserock.org/cache/" >> ~/.config/buildstream.conf if [ -n "$baserock_ostree_cache_private_key" ]; then - echo " push-url: ostree@ostree.baserock.org:cache" >> ~/.config/buildstream.conf - echo " push-port: 22200" >> ~/.config/buildstream.conf + mkdir -p ~/.config + echo "projects:" > ~/.config/buildstream.conf + echo " baserock:" >> ~/.config/buildstream.conf + echo " artifacts:" >> ~/.config/buildstream.conf + echo " url: ssh://ostree@ostree.baserock.org:22200/cache" >> ~/.config/buildstream.conf fi cat ~/.config/buildstream.conf diff --git a/project.conf b/project.conf index 6200daa1..68d967f4 100644 --- a/project.conf +++ b/project.conf @@ -127,7 +127,7 @@ variables: artifacts: - pull-url: https://ostree.baserock.org/cache/ + url: https://ostree.baserock.org/cache/ split-rules: locale: |