Skip to content

Commit b4167d9

Browse files
committed
ci: add correct platform
1 parent aa64a88 commit b4167d9

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

.github/workflows/self-hosted.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Original script from https://github.com/ptheywood/cuda-cmake-github-actions
22

3-
name: Ubuntu
3+
name: Self-Hosted
44

55
on:
66
push:
@@ -15,13 +15,13 @@ env:
1515

1616
jobs:
1717
build:
18-
name: Build ${{ matrix.self-hosted }} GCC ${{ matrix.gcc }} CUDA ${{ matrix.cuda }}
19-
runs-on: ${{ matrix.self-hosted }}
18+
name: Build ${{ matrix.os }} GCC ${{ matrix.gcc }} CUDA ${{ matrix.cuda }}
19+
runs-on: self-hosted
2020
strategy:
2121
fail-fast: false
2222
matrix:
2323
include:
24-
- self-hosted: ubuntu-24.04
24+
- os: ubuntu-24.04
2525
cuda: "12.8"
2626
gcc: 13
2727

@@ -56,14 +56,14 @@ jobs:
5656
run: cmake --build . --target all --verbose -j `nproc`
5757

5858
test:
59-
name: Test ${{ matrix.self-hosted }} GCC ${{ matrix.gcc }} CUDA ${{ matrix.cuda }}
59+
name: Test ${{ matrix.os }} GCC ${{ matrix.gcc }} CUDA ${{ matrix.cuda }}
6060
needs: build
61-
runs-on: ${{ matrix.self-hosted }}
61+
runs-on: self-hosted
6262
strategy:
6363
fail-fast: false
6464
matrix:
6565
include:
66-
- self-hosted: ubuntu-24.04
66+
- os: ubuntu-24.04
6767
cuda: "12.8"
6868
gcc: 13
6969

.github/workflows/ubuntu.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Ubuntu
44

55
on:
66
push:
7-
branches: [ master, self-hosted-runner ]
7+
branches: [ master ]
88
pull_request:
99
branches: [ master ]
1010
workflow_dispatch:
@@ -17,24 +17,25 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
include:
20-
- os: [ubuntu-18.04, ubuntu-24.04]
21-
cuda: ["10.1", "12.8"]
22-
gcc: [8, 13]
20+
- os: ubuntu-18.04
21+
cuda: "10.1"
22+
gcc: 8
2323
env:
2424
build_dir: "build"
2525
config: "Release"
26-
artifact: "cubool-${{ matrix.os }}-build.tar.xz"
26+
artifact: "cubool-ubuntu-build.tar.xz"
2727

2828
steps:
2929
- uses: actions/checkout@v4
3030
with:
31-
submodules: recursive
32-
31+
submodules: true
3332
- uses: actions/setup-python@v5
3433
with:
3534
python-version: '3.12'
3635

3736
- name: Install CUDA
37+
env:
38+
cuda: ${{ matrix.cuda }}
3839
run: |
3940
source ./scripts/install_cuda_ubuntu.sh
4041
if [[ $? -eq 0 ]]; then
@@ -52,7 +53,6 @@ jobs:
5253
echo "СС=/usr/bin/gcc-${{ matrix.gcc }}" >> $GITHUB_ENV
5354
echo "CXX=/usr/bin/g++-${{ matrix.gcc }}" >> $GITHUB_ENV
5455
echo "CUDAHOSTCXX=/usr/bin/g++-${{ matrix.gcc }}" >> $GITHUB_ENV
55-
echo "CUDACXX=/usr/local/cuda-${{ matrix.cuda }}/bin/nvcc" >> $GITHUB_ENV
5656
5757
- name: Configure CMake build
5858
run: cmake . -B ${{ env.build_dir }} -DCMAKE_BUILD_TYPE=${{ env.config }} -DCUBOOL_BUILD_TESTS=ON

0 commit comments

Comments
 (0)