summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml12
-rw-r--r--project.conf3
2 files changed, 10 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3d7013c..80ed2437 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,14 +42,16 @@ before_script:
# 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
+ # Enable push and pull for Baserock artifact cache (default config is pull only)
- |
mkdir -p ~/.config
- echo "artifacts:" > ~/.config/buildstream.conf
- echo " pull-url: https://ostree.baserock.org/cache/" >> ~/.config/buildstream.conf
+ 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
+ echo " push-url: ostree@ostree.baserock.org:cache" >> ~/.config/buildstream.conf
+ echo " push-port: 22200" >> ~/.config/buildstream.conf
fi
cat ~/.config/buildstream.conf
diff --git a/project.conf b/project.conf
index 83a09073..18023773 100644
--- a/project.conf
+++ b/project.conf
@@ -34,6 +34,9 @@ variables:
%{target-stage1}-strip --remove-section=.comment --remove-section=.note --strip-unneeded "$1"
%{target-stage1}-objcopy --add-gnu-debuglink "$debugfile" "$1"' - {} ';'
+artifacts:
+ pull-url: https://ostree.baserock.org/cache/
+
# Resolve the cpu and ABI portions of the host triple based
# on architecture names.
arches: