Skip to content

Commit cedbc80

Browse files
committed
ci: undo build caching and merge cpp compile
1 parent 152e40c commit cedbc80

File tree

2 files changed

+1
-60
lines changed

2 files changed

+1
-60
lines changed

.github/workflows/ci.yaml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ jobs:
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2222
steps:
2323
- uses: actions/checkout@v4
24-
- name: Cache build directory
25-
uses: actions/cache@v4
26-
with:
27-
path: build
28-
key: ${{ runner.os }}-build-py-${{ hashFiles('src/**', 'include/**', 'CMakeLists.txt', 'pyproject.toml') }}
29-
restore-keys: |
30-
${{ runner.os }}-build-py-
3124
- name: Install CPP dependencies
3225
run: sudo apt install $(cat debian_deps.txt)
3326
- name: Install virtual frame buffer tool
@@ -89,13 +82,6 @@ jobs:
8982
key: ${{ runner.os }}-apt-${{ hashFiles('debian_deps.txt') }}
9083
restore-keys: |
9184
${{ runner.os }}-apt-
92-
- name: Cache rcs build directory
93-
uses: actions/cache@v4
94-
with:
95-
path: build
96-
key: ${{ runner.os }}-build-py-${{ hashFiles('src/**', 'include/**', 'CMakeLists.txt', 'pyproject.toml') }}
97-
restore-keys: |
98-
${{ runner.os }}-build-py-
9985
- name: Install dependencies
10086
run: sudo apt install $(cat debian_deps.txt)
10187
- name: Set up Python 3.11
@@ -141,20 +127,6 @@ jobs:
141127
if [ -f extensions/${{ matrix.extension }}/debian_deps.txt ]; then
142128
sudo apt install $(cat extensions/${{ matrix.extension }}/debian_deps.txt)
143129
fi
144-
- name: Cache rcs build directory
145-
uses: actions/cache@v4
146-
with:
147-
path: build
148-
key: ${{ runner.os }}-build-py-${{ hashFiles('src/**', 'include/**', 'CMakeLists.txt', 'pyproject.toml') }}
149-
restore-keys: |
150-
${{ runner.os }}-build-py-
151-
- name: Cache extension build directory
152-
uses: actions/cache@v4
153-
with:
154-
path: extensions/${{ matrix.extension }}/build
155-
key: ${{ runner.os }}-build-ext-${{ matrix.extension }}-${{ hashFiles('extensions/${{ matrix.extension }}/**') }}
156-
restore-keys: |
157-
${{ runner.os }}-build-ext-${{ matrix.extension }}-
158130
- name: Install dependencies
159131
run: sudo apt install $(cat debian_deps.txt)
160132
- name: Set up Python 3.11

.github/workflows/cpp.yaml

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- master
1212

1313
jobs:
14-
build_clang:
14+
build_cpp:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v4
@@ -39,36 +39,5 @@ jobs:
3939
# run: make cpplint
4040
- name: Clang build
4141
run: make clangcompile PYTHON_EXECUTABLE=${{ steps.setup-python.outputs.python-path }}
42-
43-
build_gcc:
44-
runs-on: ubuntu-latest
45-
steps:
46-
- uses: actions/checkout@v4
47-
- name: Cache apt packages
48-
uses: actions/cache@v4
49-
with:
50-
path: /var/cache/apt/archives
51-
key: ${{ runner.os }}-apt-${{ hashFiles('debian_deps.txt') }}
52-
restore-keys: |
53-
${{ runner.os }}-apt-
54-
- name: Cache build directory
55-
uses: actions/cache@v4
56-
with:
57-
path: build
58-
key: ${{ runner.os }}-build-cpp-${{ hashFiles('src/**', 'include/**', 'CMakeLists.txt', 'pyproject.toml') }}
59-
restore-keys: |
60-
${{ runner.os }}-build-cpp-
61-
- name: Install dependencies
62-
run: sudo apt install $(cat debian_deps.txt)
63-
- name: Set up Python 3.11
64-
id: setup-python
65-
uses: actions/setup-python@v5
66-
with:
67-
python-version: "3.11"
68-
cache: "pip"
69-
- name: Install Python dependencies
70-
run: |
71-
pip install -r requirements.txt
7242
- name: GCC build
7343
run: make gcccompile PYTHON_EXECUTABLE=${{ steps.setup-python.outputs.python-path }}
74-

0 commit comments

Comments
 (0)