Skip to content

Commit 2f86257

Browse files
committed
CI: Update to Ubuntu 24.04; skip t_gdb_jtree.py due to that
1 parent 6595a3c commit 2f86257

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

.github/workflows/build-test.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,17 @@ on:
1717
permissions:
1818
contents: read
1919

20+
defaults:
21+
run:
22+
shell: bash
23+
2024
jobs:
2125
vlt:
22-
runs-on: ubuntu-22.04
26+
runs-on: ubuntu-24.04
2327
name: build and test
2428
env:
2529
CI_OS_NAME: linux
26-
CI_RUNS_ON: ubuntu-22.04
30+
CI_RUNS_ON: ubuntu-24.04
2731
CI_COMMIT: ${{ github.sha }}
2832
CCACHE_COMPRESS: 1
2933
CCACHE_DIR: ${{ github.workspace }}/.ccache
@@ -61,13 +65,19 @@ jobs:
6165
CI_BUILD_STAGE_NAME: build
6266
run: cd submodules/verilator && bash ci/ci-script.bash
6367

68+
- name: Save cache # So faster to rerun if a test below fails
69+
uses: actions/cache/save@v4
70+
id: cache
71+
with:
72+
path: ${{ github.workspace }}/.ccache
73+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.ref }}-${{ github.sha }}
74+
6475
- name: Install packages for tests
6576
env:
6677
CI_BUILD_STAGE_NAME: test
6778
run: |
68-
cd submodules/verilator && bash ci/ci-install.bash
69-
PIP_BREAK_SYSTEM_PACKAGES=1 sudo pip install --upgrade pip
70-
PIP_BREAK_SYSTEM_PACKAGES=1 sudo pip install ../astsee
79+
( cd submodules/verilator && bash ci/ci-install.bash )
80+
pipx install submodules/astsee
7181
7282
- name: Test
7383
run: |

t/t_gdb_jtree.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414

1515
out = test.run_capture("astsee_verilator -h 2>&1", check=False)
1616
if 'usage:' not in out:
17-
test.skip("No astsee installed")
17+
test.skip("No astsee command installed")
18+
19+
out = test.run_capture("python -c 'import astsee' 2>&1", check=False)
20+
if 'NotFoundError:' in out:
21+
test.skip("No astsee package file installed")
1822

1923
test.setenv(
2024
"VERILATOR_GDB", "gdb --return-child-result" +

0 commit comments

Comments
 (0)