Skip to content

Commit 5bd3d72

Browse files
authored
Merge pull request #417 from riscv-software-src/cfg_html
Fix cfg_html backend; add to regress
2 parents b81d108 + a61cbf2 commit 5bd3d72

File tree

2 files changed

+29
-4
lines changed

2 files changed

+29
-4
lines changed

.github/workflows/regress.yml

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ jobs:
4343
run: ./do test:smoke
4444
regress-gen-isa-manual:
4545
runs-on: ubuntu-latest
46-
needs: regress-smoke
4746
env:
4847
MANUAL_NAME: isa
4948
VERSIONS: all
@@ -72,9 +71,36 @@ jobs:
7271
run: ./bin/build_container
7372
- name: Generate HTML ISA manual
7473
run: ./do gen:html_manual
74+
regress-cfg-manual:
75+
runs-on: ubuntu-latest
76+
env:
77+
SINGULARITY: 1
78+
steps:
79+
- name: Clone Github Repo Action
80+
uses: actions/checkout@v4
81+
- name: Setup apptainer
82+
uses: eWaterCycle/[email protected]
83+
- name: Get container from cache
84+
id: cache-sif
85+
uses: actions/cache@v4
86+
with:
87+
path: .singularity/image.sif
88+
key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
89+
- name: Get gems and node files from cache
90+
id: cache-bundle-npm
91+
uses: actions/cache@v4
92+
with:
93+
path: |
94+
.home/.gems
95+
node_modules
96+
key: ${{ hashFiles('Gemfile.lock') }}-${{ hashFiles('package-lock.json') }}
97+
- if: ${{ steps.cache-sif.outputs.cache-hit != 'true' }}
98+
name: Build container
99+
run: ./bin/build_container
100+
- name: Generate HTML ISA manual
101+
run: ./do gen:html[generic_rv64]
75102
regress-gen-ext-pdf:
76103
runs-on: ubuntu-latest
77-
needs: regress-smoke
78104
env:
79105
EXT: B
80106
VERSION: latest
@@ -105,7 +131,6 @@ jobs:
105131
run: ./do gen:ext_pdf
106132
regress-gen-certificate:
107133
runs-on: ubuntu-latest
108-
needs: regress-smoke
109134
env:
110135
SINGULARITY: 1
111136
steps:
@@ -134,7 +159,6 @@ jobs:
134159
run: ./do gen:cert_model_pdf[MockCertificateModel]
135160
regress-gen-profile:
136161
runs-on: ubuntu-latest
137-
needs: regress-smoke
138162
env:
139163
SINGULARITY: 1
140164
steps:

lib/cfg_arch.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,7 @@ def erb_env
621621

622622
@env = Class.new
623623
@env.instance_variable_set(:@cfg, @cfg)
624+
@env.instance_variable_set(:@cfg_arch, self)
624625
@env.instance_variable_set(:@params, @params)
625626

626627
# add each parameter, either as a method (lowercase) or constant (uppercase)

0 commit comments

Comments
 (0)