Skip to content

Commit

Permalink
Merge branch 'arc-releases' into dependabot/pip/doc/zipp-3.19.1
Browse files Browse the repository at this point in the history
  • Loading branch information
qwersem authored Oct 16, 2024
2 parents 7f8ae78 + 208655d commit cbe3341
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 8 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/build-and-deploy-doc.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
name: "Build and deploy doumentation"
name: "Build and deploy documentation"

on:
push:
paths:
- doc/**
- .github/workflows/**

pull_request:
paths:
- doc/**
- .github/workflows/**

workflow_dispatch:
inputs:
Expand All @@ -19,14 +22,14 @@ on:
jobs:
doc-build-and-deploy:
name: Build and deploy documentation
runs-on: ubuntu-22.04
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build documentation
uses: ammaraskar/sphinx-action@0.4
uses: ammaraskar/sphinx-action@8.0.2
with:
docs-folder: doc

Expand All @@ -36,3 +39,10 @@ jobs:
with:
branch: gh-pages
folder: doc/_build/html

- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: html_doc
path: doc/_build/html
retention-days: 7
10 changes: 8 additions & 2 deletions .github/workflows/toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,22 @@ name: "Toolchain CI"
on:
push:
branches: [arc-releases]
paths:
- dejagnu/**
- .github/workflows/**
pull_request:
branches: [arc-releases]
paths:
- dejagnu/**
- .github/workflows/**

jobs:
tclint:
name: Lint a set of Expect scripts for dejagnu
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion dejagnu/nsim-extra.exp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# more details.

# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
# with this program. If not, see <http://www.gnu.org/licenses/>.


# -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion doc/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
sphinxcontrib.applehelp==1.0.3
urllib3==1.26.18
urllib3==1.26.19
zipp==3.19.1

0 comments on commit cbe3341

Please sign in to comment.