Use version specific build dirs

mull-project · Dec 13, 2024 · 587cdd4 · 587cdd4
1 parent a5e6fff
commit 587cdd4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml
@@ -77,12 +77,12 @@ jobs:
             UBUNTU_CODENAME=$(. /etc/os-release; echo "${UBUNTU_CODENAME/*, /}")
             env CLOUDSMITH_API_KEY=${{ secrets.CLOUDSMITH_API_KEY }} cloudsmith push deb \
               mull-project/mull-${{ steps.metadata.outputs.channel }}/${{ matrix.OS_NAME }}/${UBUNTU_CODENAME} \
-              build.dir/*.deb
+              build.${{ matrix.LLVM_VERSION }}.dir/*.deb
 
       - name: Move package
         run: |
           mkdir -p /tmp/packages
-          sudo mv build.dir/*.deb /tmp/packages/
+          sudo mv build.${{ matrix.LLVM_VERSION }}.dir/*.deb /tmp/packages/
 
       - uses: ./actions/attach-package
         with:

diff --git a/end2end-tests/run_end2end_tests.sh b/end2end-tests/run_end2end_tests.sh
@@ -10,7 +10,7 @@ if (( $LLVM_VERSION < 16 )); then
 fi
 
 # Install mull system-wide
-dpkg -i build.dir/*.deb
+dpkg -i build.${LLVM_VERSION}.dir/*.deb
 
 pushd `dirname "$0"`
 

diff --git a/infrastructure/templates/cmake-presets/ubuntu.mustache b/infrastructure/templates/cmake-presets/ubuntu.mustache
@@ -4,7 +4,7 @@
         {
             "name": "mull",
             "generator": "Ninja",
-            "binaryDir": "${sourceDir}/build.dir",
+            "binaryDir": "${sourceDir}/build.{{{LLVM_VERSION}}}.dir",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Release",
                 "CMAKE_C_COMPILER": "clang-{{LLVM_VERSION}}",

diff --git a/infrastructure/templates/github-actions/ci-ubuntu.yml.mustache b/infrastructure/templates/github-actions/ci-ubuntu.yml.mustache
@@ -55,12 +55,12 @@ jobs:
             UBUNTU_CODENAME=$(. /etc/os-release; echo "${UBUNTU_CODENAME/*, /}")
             env CLOUDSMITH_API_KEY=${{ secrets.CLOUDSMITH_API_KEY }} cloudsmith push deb \
               mull-project/mull-${{ steps.metadata.outputs.channel }}/${{ matrix.OS_NAME }}/${UBUNTU_CODENAME} \
-              build.dir/*.deb
+              build.${{ matrix.LLVM_VERSION }}.dir/*.deb
 
       - name: Move package
         run: |
           mkdir -p /tmp/packages
-          sudo mv build.dir/*.deb /tmp/packages/
+          sudo mv build.${{ matrix.LLVM_VERSION }}.dir/*.deb /tmp/packages/
 
       - uses: ./actions/attach-package
         with: