Skip to content

Commit bb0d1b6

Browse files
committed
Clean up docker and pipeline
1 parent df8630f commit bb0d1b6

File tree

3 files changed

+11
-23
lines changed

3 files changed

+11
-23
lines changed

.github/workflows/build-cpp-runtime-bindings.yml

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,56 +37,45 @@ concurrency:
3737
jobs:
3838
build-cpp-runtime-bindings:
3939
runs-on: ubuntu-22.04
40-
strategy:
41-
matrix:
42-
platform:
43-
- {name: 'manylinux228', dockerfile: 'docker/x86_64/manylinux228/Dockerfile', cc: 'gcc', cxx: 'g++', suffix: ''}
4440

4541
steps:
4642
- uses: actions/checkout@v5
4743

4844
- name: Build Docker image
4945
run: |
50-
docker build -t svs-${{ matrix.platform.name }}:latest -f ${{ matrix.platform.dockerfile }} .
46+
docker build -t svs-manylinux228:latest -f docker/x86_64/manylinux228/Dockerfile .
5147
5248
- name: Build libraries in Docker container
5349
run: |
5450
docker run --rm \
5551
-v ${{ github.workspace }}:/workspace \
5652
-w /workspace \
57-
-e PLATFORM_NAME=${{ matrix.platform.suffix }} \
58-
-e CC=${{ matrix.platform.cc }} \
59-
-e CXX=${{ matrix.platform.cxx }} \
60-
svs-${{ matrix.platform.name }}:latest \
53+
svs-manylinux228:latest \
6154
/bin/bash -c "chmod +x docker/x86_64/build-cpp-runtime-bindings.sh && ./docker/x86_64/build-cpp-runtime-bindings.sh"
6255
6356
- name: Upload cpp runtime bindings artifacts
6457
uses: actions/upload-artifact@v4
6558
with:
66-
name: svs-cpp-runtime-bindings${{ matrix.platform.suffix }}
67-
path: svs-cpp-runtime-bindings${{ matrix.platform.suffix }}.tar.gz
59+
name: svs-cpp-runtime-bindings
60+
path: svs-cpp-runtime-bindings.tar.gz
6861
retention-days: 7 # Reduce retention due to size
6962

7063
test:
7164
needs: build-cpp-runtime-bindings
7265
runs-on: ubuntu-22.04
73-
strategy:
74-
matrix:
75-
platform:
76-
- {name: 'manylinux228', dockerfile: 'docker/x86_64/manylinux228/Dockerfile', cc: 'gcc', cxx: 'g++', suffix: ''}
7766

7867
steps:
7968
- uses: actions/checkout@v5
8069

8170
- name: Build Docker image
8271
run: |
83-
docker build -t svs-${{ matrix.platform.name }}:latest -f ${{ matrix.platform.dockerfile }} .
72+
docker build -t svs-manylinux228:latest -f docker/x86_64/manylinux228/Dockerfile .
8473
8574
# Need to download for a new job
8675
- name: Download shared libraries
8776
uses: actions/download-artifact@v4
8877
with:
89-
name: svs-cpp-runtime-bindings${{ matrix.platform.suffix }}
78+
name: svs-cpp-runtime-bindings
9079
path: runtime_lib
9180

9281
- name: List available artifacts
@@ -99,7 +88,5 @@ jobs:
9988
-v ${{ github.workspace }}:/workspace \
10089
-v ${{ github.workspace }}/runtime_lib:/runtime_lib \
10190
-w /workspace \
102-
-e CC=${{ matrix.platform.cc }} \
103-
-e CXX=${{ matrix.platform.cxx }} \
104-
svs-${{ matrix.platform.name }}:latest \
91+
svs-manylinux228:latest \
10592
/bin/bash -c "chmod +x docker/x86_64/test-cpp-runtime-bindings.sh && ./docker/x86_64/test-cpp-runtime-bindings.sh"

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@ __pycache__/
1919
/bindings/python/_skbuild/
2020
/bindings/python/dist/
2121

22+
# CPP bindings build files
23+
/bindings/cpp/build/
24+
2225
# Example generated files.
2326
example_data_*/

docker/x86_64/build-cpp-runtime-bindings.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ set -e # Exit on error
1818
# Source environment setup (for compiler and MKL)
1919
source /etc/bashrc || true
2020

21-
# Set CMake arguments based on environment variables
22-
2321
# Create build+install directories for cpp runtime bindings
2422
rm -rf /workspace/bindings/cpp/build_cpp_bindings /workspace/install_cpp_bindings
2523
mkdir -p /workspace/bindings/cpp/build_cpp_bindings /workspace/install_cpp_bindings
@@ -33,4 +31,4 @@ cmake --install .
3331
# Create tarball with symlink for compatibility
3432
cd /workspace/install_cpp_bindings && \
3533
ln -s lib lib64 && \
36-
tar -czvf /workspace/svs-cpp-runtime-bindings${PLATFORM_NAME}.tar.gz .
34+
tar -czvf /workspace/svs-cpp-runtime-bindings.tar.gz .

0 commit comments

Comments
 (0)