Skip to content

Commit

Permalink
Merge branch 'amd-staging' into amd/danielsu/enable-azure-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
danielsu-amd authored Oct 15, 2024
2 parents c6a0ba1 + c022bff commit b25420c
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 47 deletions.
5 changes: 0 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

version: 2
updates:
- package-ecosystem: "" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"

- package-ecosystem: "pip" # See documentation for possible values
directory: "/docs/sphinx" # Location of package manifests
open-pull-requests-limit: 10
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
schedule:
- cron: 0 5 * * *
push:
branches: [main, amd-mainline]
branches: [amd-staging]
paths:
- '.github/workflows/containers.yml'
- 'docker/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cpack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ run-name: cpack
on:
workflow_dispatch:
push:
branches: [main, amd-mainline, release/**]
branches: [amd-staging, amd-mainline, release/**]
tags:
- "v[1-9].[0-9]+.[0-9]+*"
- "rocm-[1-9].[0-9]+.[0-9]+*"
Expand All @@ -13,7 +13,7 @@ on:
- 'docs/**'
- 'source/docs/**'
pull_request:
branches: [main, amd-mainline]
branches: [amd-staging]
paths:
- '.github/workflows/cpack.yml'
- 'docker/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: Documentation
on:
workflow_dispatch:
push:
branches: [main, amd-mainline, gh-pages]
branches: [amd-staging, amd-mainline, gh-pages]
paths:
- '*.md'
- 'source/docs/**'
- '.github/workflows/docs.yml'
- 'VERSION'
pull_request:
branches: [main, amd-mainline]
branches: [amd-staging, amd-mainline]
paths:
- '*.md'
- 'source/docs/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ run-name: formatting

on:
push:
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
branches: [ amd-mainline, amd-staging, release/** ]
pull_request:
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
branches: [ amd-mainline, amd-staging, release/** ]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/opensuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ run-name: opensuse-15

on:
push:
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
branches: [ amd-mainline, amd-staging, release/** ]
paths-ignore:
- '*.md'
- 'docs/**'
Expand All @@ -15,7 +15,7 @@ on:
- '.github/workflows/formatting.yml'
- 'docker/**'
pull_request:
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
branches: [ amd-mainline, amd-staging, release/** ]
paths-ignore:
- '*.md'
- 'docs/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/redhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ run-name: redhat

on:
push:
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
branches: [ amd-mainline, amd-staging, release/** ]
paths-ignore:
- '*.md'
- 'docs/**'
Expand All @@ -15,7 +15,7 @@ on:
- '.github/workflows/formatting.yml'
- 'docker/**'
pull_request:
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
branches: [ amd-mainline, amd-staging, release/** ]
paths-ignore:
- '*.md'
- 'docs/**'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ on:
workflow_dispatch:
push:
tags:
- v*
- "v[1-9].[0-9]+.[0-9]+*"
- "rocm-[1-9].[0-9]+.[0-9]+*"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu-focal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ run-name: ubuntu-focal

on:
push:
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
branches: [ amd-mainline, amd-staging, release/** ]
paths-ignore:
- '*.md'
- 'docs/**'
Expand All @@ -15,7 +15,7 @@ on:
- '.github/workflows/formatting.yml'
- 'docker/**'
pull_request:
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
branches: [ amd-mainline, amd-staging, release/** ]
paths-ignore:
- '*.md'
- 'docs/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu-jammy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ run-name: ubuntu-jammy

on:
push:
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
branches: [ amd-mainline, amd-staging, release/** ]
paths-ignore:
- '*.md'
- 'docs/**'
Expand All @@ -15,7 +15,7 @@ on:
- '.github/workflows/formatting.yml'
- 'docker/**'
pull_request:
branches: [ main, develop, amd-mainline, amd-staging, release/** ]
branches: [ amd-mainline, amd-staging, release/** ]
paths-ignore:
- '*.md'
- 'docs/**'
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/requirements.in
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rocm-docs-core[api_reference]==1.4.1
rocm-docs-core[api_reference]==1.8.2
50 changes: 25 additions & 25 deletions docs/sphinx/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
#
accessible-pygments==0.0.5
# via pydata-sphinx-theme
alabaster==0.7.16
alabaster==1.0.0
# via sphinx
babel==2.15.0
babel==2.16.0
# via
# pydata-sphinx-theme
# sphinx
beautifulsoup4==4.12.3
# via pydata-sphinx-theme
breathe==4.35.0
# via rocm-docs-core
certifi==2024.7.4
certifi==2024.8.30
# via requests
cffi==1.16.0
cffi==1.17.1
# via
# cryptography
# pynacl
Expand All @@ -41,15 +41,15 @@ docutils==0.21.2
# myst-parser
# pydata-sphinx-theme
# sphinx
doxysphinx==3.3.9
doxysphinx==3.3.10
# via rocm-docs-core
fastjsonschema==2.20.0
# via rocm-docs-core
gitdb==4.0.11
# via gitpython
gitpython==3.1.43
# via rocm-docs-core
idna==3.7
idna==3.10
# via requests
imagesize==1.4.1
# via sphinx
Expand All @@ -67,13 +67,13 @@ markdown-it-py==3.0.0
# myst-parser
markupsafe==2.1.5
# via jinja2
mdit-py-plugins==0.4.1
mdit-py-plugins==0.4.2
# via myst-parser
mdurl==0.1.2
# via markdown-it-py
mpire==2.10.2
# via doxysphinx
myst-parser==3.0.1
myst-parser==4.0.0
# via rocm-docs-core
numpy==1.26.4
# via doxysphinx
Expand All @@ -87,7 +87,7 @@ pydata-sphinx-theme==0.15.4
# via
# rocm-docs-core
# sphinx-book-theme
pygithub==2.3.0
pygithub==2.4.0
# via rocm-docs-core
pygments==2.18.0
# via
Expand All @@ -97,13 +97,13 @@ pygments==2.18.0
# sphinx
pyjson5==1.6.6
# via doxysphinx
pyjwt[crypto]==2.8.0
pyjwt[crypto]==2.9.0
# via pygithub
pynacl==1.5.0
# via pygithub
pyparsing==3.1.2
pyparsing==3.1.4
# via doxysphinx
pyyaml==6.0.1
pyyaml==6.0.2
# via
# myst-parser
# rocm-docs-core
Expand All @@ -112,15 +112,15 @@ requests==2.32.3
# via
# pygithub
# sphinx
rocm-docs-core[api-reference]==1.4.1
rocm-docs-core[api-reference]==1.8.2
# via -r requirements.in
smmap==5.0.1
# via gitdb
snowballstemmer==2.2.0
# via sphinx
soupsieve==2.5
soupsieve==2.6
# via beautifulsoup4
sphinx==7.3.7
sphinx==8.0.2
# via
# breathe
# myst-parser
Expand All @@ -135,33 +135,33 @@ sphinx-book-theme==1.1.3
# via rocm-docs-core
sphinx-copybutton==0.5.2
# via rocm-docs-core
sphinx-design==0.6.0
sphinx-design==0.6.1
# via rocm-docs-core
sphinx-external-toc==1.0.1
# via rocm-docs-core
sphinx-notfound-page==1.0.2
sphinx-notfound-page==1.0.4
# via rocm-docs-core
sphinxcontrib-applehelp==1.0.8
sphinxcontrib-applehelp==2.0.0
# via sphinx
sphinxcontrib-devhelp==1.0.6
sphinxcontrib-devhelp==2.0.0
# via sphinx
sphinxcontrib-htmlhelp==2.0.5
sphinxcontrib-htmlhelp==2.1.0
# via sphinx
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.7
sphinxcontrib-qthelp==2.0.0
# via sphinx
sphinxcontrib-serializinghtml==1.1.10
sphinxcontrib-serializinghtml==2.0.0
# via sphinx
tomli==2.0.1
tomli==2.0.2
# via sphinx
tqdm==4.66.4
tqdm==4.66.5
# via mpire
typing-extensions==4.12.2
# via
# pydata-sphinx-theme
# pygithub
urllib3==2.2.2
urllib3==2.2.3
# via
# pygithub
# requests
Expand Down

0 comments on commit b25420c

Please sign in to comment.