Skip to content

Commit 4504786

Browse files
authored
fix(ci): paths from pages (#1013)
1 parent 04cde30 commit 4504786

File tree

5 files changed

+39
-12
lines changed

5 files changed

+39
-12
lines changed

.github/workflows/deploy.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ jobs:
4040
- name: singularity setup
4141
uses: ./.github/actions/singularity-setup
4242
- name: run reuse
43-
run: ./bin/reuse spdx -o reuse_bom
43+
run: ./bin/reuse spdx -o reuse_bom.txt
4444
- name: Upload Reuse Manifest
4545
uses: actions/upload-artifact@v4
4646
if: (github.event_name == 'push') && (github.ref_name == 'main')
4747
with:
4848
name: reuse-manifest
49-
path: reuse_bom
49+
path: reuse_bom.txt
5050
retention-days: 1
5151
build-udb-api-doc:
5252
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
@@ -460,3 +460,19 @@ jobs:
460460
with:
461461
name: mc100-32-ctp
462462
path: gen/proc_ctp/pdf/MC100-32-CTP.pdf
463+
build-idl-doc:
464+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
465+
runs-on: ubuntu-latest
466+
steps:
467+
- name: Clone Github Repo Action
468+
uses: actions/checkout@v4
469+
- name: singularity setup
470+
uses: ./.github/actions/singularity-setup
471+
- name: Build IDL doc
472+
run: ./bin/bundle exec asciidoctor -r idl_highlighter -a toc=left -a source-highlighter=rouge -o idl.html doc/idl.adoc
473+
- name: Upload IDL Doc
474+
uses: actions/upload-artifact@v4
475+
if: (github.event_name == 'push') && (github.ref_name == 'main')
476+
with:
477+
name: idl-doc
478+
path: idl.html

.github/workflows/pages.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/download-artifact@v5
3434
with:
3535
name: reuse-manifest
36-
path: _site/reuse_bom.txt
36+
path: _site/
3737
github-token: ${{ secrets.GITHUB_TOKEN }}
3838
run-id: ${{ github.event.workflow_run.id }}
3939
- name: Download resolved spec
@@ -82,14 +82,14 @@ jobs:
8282
uses: actions/download-artifact@v5
8383
with:
8484
name: isa-html-manual
85-
path: _site/manual
85+
path: _site/manual/html
8686
github-token: ${{ secrets.GITHUB_TOKEN }}
8787
run-id: ${{ github.event.workflow_run.id }}
8888
- name: Download HTML ISA Manual
8989
uses: actions/download-artifact@v5
9090
with:
9191
name: cfg-html-manual
92-
path: _site/example_cfg
92+
path: _site/example_cfg/html
9393
github-token: ${{ secrets.GITHUB_TOKEN }}
9494
run-id: ${{ github.event.workflow_run.id }}
9595
- name: Download Instruction Appendix
@@ -211,6 +211,13 @@ jobs:
211211
path: _site/pdfs
212212
github-token: ${{ secrets.GITHUB_TOKEN }}
213213
run-id: ${{ github.event.workflow_run.id }}
214+
- name: Download IDL Doc
215+
uses: actions/download-artifact@v5
216+
with:
217+
name: idl-doc
218+
path: idl.html
219+
github-token: ${{ secrets.GITHUB_TOKEN }}
220+
run-id: ${{ github.event.workflow_run.id }}
214221
- name: Create index
215222
env:
216223
PAGES_URL: https://riscv-software-src.github.io/riscv-unified-db

tools/ruby-gems/udb/README.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ under the `cfgs` directory.
1212

1313
== Library interface
1414

15-
The main entry point to the udb database is through the `ConfiguredArchitecture` object.
15+
The main entry point to the udb database is through the {Udb::ConfiguredArchitecture} object.
1616
You can construct one with:
1717

1818
[source,ruby]
@@ -52,7 +52,7 @@ Examples:
5252
[source,bash]
5353
--
5454
udb list extensions # list all extensions in RISC-V
55-
udb list extensions --config qc_iu # list all extensions in the $UDB_ROOT/qc_iu.yaml config
55+
udb list extensions --config qc_iu # list all extensions in the $UDB_ROOT/cfgs/qc_iu.yaml config
5656
udb list extensions --config /path/to/cfg.yaml # list all extensions from config /path/to/cfg.yaml
5757
UDB_ROOT=/path/to/root udb list extensions # list all extensions in RISC-V, using UDB repo at /path/to/root
5858

tools/ruby-gems/udb/Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
22
# SPDX-License-Identifier: BSD-3-Clause-Clear
33

4-
# frozen_string_literal: true
54
# typed: true
5+
# frozen_string_literal: true
66

77
RUBY_UDB_ROOT = Kernel.__dir__
88

@@ -48,7 +48,7 @@ namespace :gen do
4848
task :api_doc do
4949
Dir.chdir(RUBY_UDB_ROOT) do
5050
FileUtils.rm_rf $root / "gen" / "udb_api_doc"
51-
sh "bundle exec yard --plugin sorbet lib/**/*.rb --no-save --embed-mixins --hide-void-return -o #{$root}/gen/udb_api_doc"
51+
sh "bundle exec yard --plugin sorbet lib --no-save --embed-mixins --hide-void-return -o #{$root}/gen/udb_api_doc"
5252
end
5353
end
5454
end

tools/scripts/pages.html.erb

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,18 @@
1111
<p>Created on <%= Date.today %></p>
1212

1313
<br/>
14-
<h3>Resolved architecture</h3>
14+
<h3>Resolved standard specification</h3>
15+
<p>
16+
The <em>resolved specification</em> is the database after applying the <code>$inherits</code> operator on data.
17+
The resolved specification is what should be used by downstream tools.
18+
</p>
1519
<ul>
1620
<li>
1721
<a href="<%= ENV["PAGES_URL"] %>/resolved_spec/index.yaml">index.yaml</a>
1822
Database index, as array of relative paths from <%= ENV["PAGES_URL"] %>/resolved_spec
1923
<ul>
2024
<li>
21-
For example, you can find <a href="<%= ENV["PAGES_URL"] %>/resolved_spec/ext/Sm.yaml">Sm.yaml</a> at <%= ENV["PAGES_URL"] %>/resolved_spec/ext/Sm.yaml
25+
For example, you can find Sm.yaml at <a href="<%= ENV["PAGES_URL"] %>/resolved_spec/ext/Sm.yaml"><%= ENV["PAGES_URL"] %>/resolved_spec/ext/Sm.yaml</a>
2226
</li>
2327
</ul>
2428
</li>
@@ -98,7 +102,7 @@
98102
<br/>
99103
<h3>IDL Documentation</h3>
100104
<ul>
101-
<li><a href="<%= ENV["PAGES_URL"] %>/ruby/idl/index.html">IDL language documentation</a></li>
105+
<li><a href="<%= ENV["PAGES_URL"] %>/idl.html">IDL language documentation</a></li>
102106
</ul>
103107

104108
<br/>

0 commit comments

Comments
 (0)