[gnome-build-meta/abderrahim/bst2: 9/9] .gitlab-ci: switch to buildstream 2




commit 9f420d6c78d1cb03a26b422ffb5fca15e69dd9cc
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Mon Jul 4 19:35:26 2022 +0100

    .gitlab-ci: switch to buildstream 2

 .gitlab-ci.yml                     | 20 ++++++++++----------
 .gitlab-ci/buildstream-nopush.conf |  3 +--
 .gitlab-ci/buildstream.conf        |  3 +--
 3 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc480e5de..207636403 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ stages:
 - reports
 
 default:
-  image: "${DOCKER_REGISTRY}/bst16:${DOCKER_IMAGE_ID}"
+  image: "${DOCKER_REGISTRY}/bst2:${DOCKER_IMAGE_ID}"
   before_script:
   # Ensure the log directory exists
   - mkdir -p logs
@@ -74,7 +74,7 @@ default:
   allow_failure: true
   script:
   - ${BST_NO_PUSH} --max-jobs $(( $(nproc) / 4 )) -o arch "${ARCH}" build "${IMAGE}"
-  - ${BST} -o arch "${ARCH}" checkout --hardlinks "${IMAGE}" image
+  - ${BST} -o arch "${ARCH}" artifact checkout --hardlinks "${IMAGE}" --directory image
   artifacts:
     when: always
     paths:
@@ -99,11 +99,11 @@ default:
 
   - ostree init --repo repo/ --mode archive
 
-  - ${BST} -o arch "${ARCH}" pull vm/repo.bst vm/repo-devel.bst
+  - ${BST} -o arch "${ARCH}" artifact pull vm/repo.bst vm/repo-devel.bst
 
   - |
     for element in vm/repo.bst vm/repo-devel.bst; do
-        ${BST} -o arch "${ARCH}" checkout --hardlinks $element checkout-repo/
+        ${BST} -o arch "${ARCH}" artifact checkout --hardlinks $element --directory checkout-repo/
         ostree pull-local --repo=repo/ checkout-repo/
         rm -rf checkout-repo/
     done
@@ -124,7 +124,7 @@ track:
   timeout: 15m
   script:
   - 'sed -i "s/track-tags: false/track-tags: ${BST_TRACK_TAGS}/" project.conf'
-  - ${BST} track --deps all core.bst flatpak-runtimes.bst vm/image.bst boards/pinebook-pro/image.bst 
boards/rock64/image.bst boards/raspberrypi-4/image.bst vm/repo-devel.bst iso/image.bst
+  - ${BST} source track --deps all core.bst flatpak-runtimes.bst vm/image.bst boards/pinebook-pro/image.bst 
boards/rock64/image.bst boards/raspberrypi-4/image.bst vm/repo-devel.bst iso/image.bst
   - echo $CI_JOB_ID > track-job.id
   retry: 2
   # only run on branches targeting master
@@ -312,8 +312,8 @@ s3-image:
     artifacts: false
   script:
   - ${BST_NO_PUSH} --max-jobs $(( $(nproc) / 4 )) -o arch "${ARCH}" build vm/image.bst iso/image.bst
-  - ${BST} -o arch "${ARCH}" checkout --hardlinks vm/image.bst image
-  - ${BST} -o arch "${ARCH}" checkout --hardlinks iso/image.bst iso
+  - ${BST} -o arch "${ARCH}" artifact checkout --hardlinks vm/image.bst --directory image
+  - ${BST} -o arch "${ARCH}" artifact checkout --hardlinks iso/image.bst --directory iso
 
   - |
     if [ -n "$CI_COMMIT_TAG" ]; then
@@ -398,10 +398,10 @@ cve_report:
   - job: 'build-x86_64'
     artifacts: false
   script:
-  - ${BST} pull flatpak/platform-manifest.bst flatpak/sdk-manifest.bst
+  - ${BST} artifact pull flatpak/platform-manifest.bst flatpak/sdk-manifest.bst
 
-  - ${BST} checkout flatpak/platform-manifest.bst platform-manifest/
-  - ${BST} checkout flatpak/sdk-manifest.bst sdk-manifest/
+  - ${BST} artifact checkout flatpak/platform-manifest.bst platform-manifest/
+  - ${BST} artifact checkout flatpak/sdk-manifest.bst sdk-manifest/
 
   - mkdir -p cve
   - cd cve
diff --git a/.gitlab-ci/buildstream-nopush.conf b/.gitlab-ci/buildstream-nopush.conf
index 06a5c2304..4c691db35 100644
--- a/.gitlab-ci/buildstream-nopush.conf
+++ b/.gitlab-ci/buildstream-nopush.conf
@@ -4,8 +4,7 @@
 logdir: ${CI_PROJECT_DIR}/logs
 
 # build area and artifacts
-builddir: ${CI_PROJECT_DIR}/build
-artifactdir: ${CI_PROJECT_DIR}/artifacts
+cachedir: ${CI_PROJECT_DIR}/cache
 
 # and sources in the dedicated volume
 sourcedir: /cache/buildstream/sources
diff --git a/.gitlab-ci/buildstream.conf b/.gitlab-ci/buildstream.conf
index dafd794b2..d43bd41e1 100644
--- a/.gitlab-ci/buildstream.conf
+++ b/.gitlab-ci/buildstream.conf
@@ -4,8 +4,7 @@
 logdir: ${CI_PROJECT_DIR}/logs
 
 # build area and artifacts
-builddir: ${CI_PROJECT_DIR}/build
-artifactdir: ${CI_PROJECT_DIR}/artifacts
+cachedir: ${CI_PROJECT_DIR}/cache
 
 # and sources in the dedicated volume
 sourcedir: /cache/buildstream/sources


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]