Skip to content

Commit ea026b7

Browse files
committed
Update build.yml
Homogenize the build directory across the various builds. This is primarily motivated by the desire to add a bazel based build which uses BUILD making the build directory unusable on case sensitive file systems (Windows, Darwin). This should fix an issue in the Darwin builds not uploading results.
1 parent 24a1792 commit ea026b7

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
run: choco install winflexbison3
2222

2323
- name: Configure
24-
run: cmake -B ${{ github.workspace }}/build -C ${{ github.workspace }}/cmake/caches/MSVCWarnings.cmake -D CMAKE_BUILD_TYPE=Release -G "Visual Studio 17 2022" -A ${{ matrix.arch }} -S ${{ github.workspace }}
24+
run: cmake -B ${{ github.workspace }}/BinaryCache/ds2 -C ${{ github.workspace }}/cmake/caches/MSVCWarnings.cmake -D CMAKE_BUILD_TYPE=Release -G "Visual Studio 17 2022" -A ${{ matrix.arch }} -S ${{ github.workspace }}
2525
- name: Build
26-
run: cmake --build ${{ github.workspace }}/build --config Release
26+
run: cmake --build ${{ github.workspace }}/BinaryCache/ds2 --config Release
2727

2828
- uses: actions/upload-artifact@v2
2929
with:
3030
name: windows-${{ matrix.arch }}-ds2
3131
path: |
32-
build/Release/ds2.exe
32+
${{ github.workspace }}/BinaryCache/ds2/Release/ds2.exe
3333
3434
3535
mingw:
@@ -60,15 +60,15 @@ jobs:
6060
- uses: actions/checkout@v2
6161

6262
- name: Configure
63-
run: cmake -B $(cygpath -u '${{ github.workspace }}/build') -C $(cygpath -u '${{ github.workspace }}/cmake/caches/GNUWarnings.cmake') -D CMAKE_BUILD_TYPE=Release -G Ninja -S $(cygpath -u '${{ github.workspace }}')
63+
run: cmake -B $(cygpath -u '${{ github.workspace }}/BinaryCache/ds2') -C $(cygpath -u '${{ github.workspace }}/cmake/caches/GNUWarnings.cmake') -D CMAKE_BUILD_TYPE=Release -G Ninja -S $(cygpath -u '${{ github.workspace }}')
6464
- name: Build
65-
run: cmake --build $(cygpath -u '${{ github.workspace }}/build') --config Release
65+
run: cmake --build $(cygpath -u '${{ github.workspace }}/BinaryCache/ds2') --config Release
6666

6767
- uses: actions/upload-artifact@v2
6868
with:
6969
name: mingw-${{ matrix.system }}-ds2
7070
path: |
71-
build/Release/ds2.exe
71+
${{ github.workspace }}/BinaryCache/ds2/Release/ds2.exe
7272
7373
macos:
7474
runs-on: macos-latest
@@ -78,15 +78,15 @@ jobs:
7878
- uses: seanmiddleditch/gha-setup-ninja@master
7979

8080
- name: Configure
81-
run: cmake -B ${{ github.workspace }}/out -C ${{ github.workspace }}/cmake/caches/ClangWarnings.cmake -D CMAKE_BUILD_TYPE=Release -G Ninja -S ${{ github.workspace }}
81+
run: cmake -B ${{ github.workspace }}/BinaryCache/ds2 -C ${{ github.workspace }}/cmake/caches/ClangWarnings.cmake -D CMAKE_BUILD_TYPE=Release -G Ninja -S ${{ github.workspace }}
8282
- name: Build
83-
run: cmake --build ${{ github.workspace }}/out --config Release
83+
run: cmake --build ${{ github.workspace }}/BinaryCache/ds2 --config Release
8484

8585
- uses: actions/upload-artifact@v2
8686
with:
8787
name: macOS-x86_64-ds2
8888
path: |
89-
build/ds2
89+
${{ github.workspace }}/BinaryCache/ds2/ds2
9090
9191
linux:
9292
runs-on: ubuntu-latest
@@ -105,12 +105,12 @@ jobs:
105105
sudo apt-get install -qq --no-install-recommends bison flex gcc-multilib g++-multilib ninja-build
106106
107107
- name: Configure
108-
run: cmake -B ${{ github.workspace }}/build -C ${{ github.workspace }}/cmake/caches/GNUWarnings.cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_SYSTEM_NAME=Linux -D CMAKE_SYSTEM_PROCESSOR=${{ matrix.processor }} -D CMAKE_C_FLAGS=${{ matrix.cflags }} -D CMAKE_CXX_FLAGS=${{ matrix.cxxflags }} -G Ninja -S ${{ github.workspace }}
108+
run: cmake -B ${{ github.workspace }}/BinaryCache/ds2 -C ${{ github.workspace }}/cmake/caches/GNUWarnings.cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_SYSTEM_NAME=Linux -D CMAKE_SYSTEM_PROCESSOR=${{ matrix.processor }} -D CMAKE_C_FLAGS=${{ matrix.cflags }} -D CMAKE_CXX_FLAGS=${{ matrix.cxxflags }} -G Ninja -S ${{ github.workspace }}
109109
- name: Build
110-
run: cmake --build ${{ github.workspace }}/build --config Releaase
110+
run: cmake --build ${{ github.workspace }}/BinaryCache/ds2 --config Releaase
111111

112112
- uses: actions/upload-artifact@v2
113113
with:
114114
name: linux-${{ matrix.processor }}-ds2
115115
path: |
116-
build/ds2
116+
${{ github.workspace }}/BinaryCache/ds2/ds2

0 commit comments

Comments
 (0)