Skip to content

Commit 587cdd4

Browse files
committed
Use version specific build dirs
1 parent a5e6fff commit 587cdd4

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/ci-ubuntu.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ jobs:
7777
UBUNTU_CODENAME=$(. /etc/os-release; echo "${UBUNTU_CODENAME/*, /}")
7878
env CLOUDSMITH_API_KEY=${{ secrets.CLOUDSMITH_API_KEY }} cloudsmith push deb \
7979
mull-project/mull-${{ steps.metadata.outputs.channel }}/${{ matrix.OS_NAME }}/${UBUNTU_CODENAME} \
80-
build.dir/*.deb
80+
build.${{ matrix.LLVM_VERSION }}.dir/*.deb
8181
8282
- name: Move package
8383
run: |
8484
mkdir -p /tmp/packages
85-
sudo mv build.dir/*.deb /tmp/packages/
85+
sudo mv build.${{ matrix.LLVM_VERSION }}.dir/*.deb /tmp/packages/
8686
8787
- uses: ./actions/attach-package
8888
with:

end2end-tests/run_end2end_tests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if (( $LLVM_VERSION < 16 )); then
1010
fi
1111

1212
# Install mull system-wide
13-
dpkg -i build.dir/*.deb
13+
dpkg -i build.${LLVM_VERSION}.dir/*.deb
1414

1515
pushd `dirname "$0"`
1616

infrastructure/templates/cmake-presets/ubuntu.mustache

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
"name": "mull",
66
"generator": "Ninja",
7-
"binaryDir": "${sourceDir}/build.dir",
7+
"binaryDir": "${sourceDir}/build.{{{LLVM_VERSION}}}.dir",
88
"cacheVariables": {
99
"CMAKE_BUILD_TYPE": "Release",
1010
"CMAKE_C_COMPILER": "clang-{{LLVM_VERSION}}",

infrastructure/templates/github-actions/ci-ubuntu.yml.mustache

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ jobs:
5555
UBUNTU_CODENAME=$(. /etc/os-release; echo "${UBUNTU_CODENAME/*, /}")
5656
env CLOUDSMITH_API_KEY=${{ secrets.CLOUDSMITH_API_KEY }} cloudsmith push deb \
5757
mull-project/mull-${{ steps.metadata.outputs.channel }}/${{ matrix.OS_NAME }}/${UBUNTU_CODENAME} \
58-
build.dir/*.deb
58+
build.${{ matrix.LLVM_VERSION }}.dir/*.deb
5959

6060
- name: Move package
6161
run: |
6262
mkdir -p /tmp/packages
63-
sudo mv build.dir/*.deb /tmp/packages/
63+
sudo mv build.${{ matrix.LLVM_VERSION }}.dir/*.deb /tmp/packages/
6464

6565
- uses: ./actions/attach-package
6666
with:

0 commit comments

Comments
 (0)