From 1daafab8e0f6020eabf1922e35b9a0b049bd1589 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Tue, 1 Oct 2024 10:22:56 -0400 Subject: [PATCH 1/2] Update workflows (#400) * Update Workflows Remove references to "main" and "develop" branches. Add "rocm" tag to the release workflow. --------- Signed-off-by: David Galiffi --- .github/workflows/containers.yml | 2 +- .github/workflows/cpack.yml | 4 ++-- .github/workflows/docs.yml | 4 ++-- .github/workflows/formatting.yml | 4 ++-- .github/workflows/opensuse.yml | 4 ++-- .github/workflows/redhat.yml | 4 ++-- .github/workflows/release.yml | 3 ++- .github/workflows/ubuntu-focal.yml | 4 ++-- .github/workflows/ubuntu-jammy.yml | 4 ++-- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index db5441d79..0f001ea1d 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -7,7 +7,7 @@ on: schedule: - cron: 0 5 * * * push: - branches: [main, amd-mainline] + branches: [amd-staging] paths: - '.github/workflows/containers.yml' - 'docker/**' diff --git a/.github/workflows/cpack.yml b/.github/workflows/cpack.yml index a564b6899..fa1b01933 100644 --- a/.github/workflows/cpack.yml +++ b/.github/workflows/cpack.yml @@ -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]+*" @@ -13,7 +13,7 @@ on: - 'docs/**' - 'source/docs/**' pull_request: - branches: [main, amd-mainline] + branches: [amd-staging] paths: - '.github/workflows/cpack.yml' - 'docker/**' diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 4b2340fd3..eec86ee60 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -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/**' diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index f3e4b7df0..f41db760e 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -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 }} diff --git a/.github/workflows/opensuse.yml b/.github/workflows/opensuse.yml index ecec47ece..54f8ba1d1 100644 --- a/.github/workflows/opensuse.yml +++ b/.github/workflows/opensuse.yml @@ -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/**' @@ -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/**' diff --git a/.github/workflows/redhat.yml b/.github/workflows/redhat.yml index 0a3869d80..43779b59d 100644 --- a/.github/workflows/redhat.yml +++ b/.github/workflows/redhat.yml @@ -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/**' @@ -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/**' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 085c884b8..d2c91c535 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 }} diff --git a/.github/workflows/ubuntu-focal.yml b/.github/workflows/ubuntu-focal.yml index 5be371a0d..1e60af645 100644 --- a/.github/workflows/ubuntu-focal.yml +++ b/.github/workflows/ubuntu-focal.yml @@ -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/**' @@ -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/**' diff --git a/.github/workflows/ubuntu-jammy.yml b/.github/workflows/ubuntu-jammy.yml index a7d1d5331..a903231c9 100644 --- a/.github/workflows/ubuntu-jammy.yml +++ b/.github/workflows/ubuntu-jammy.yml @@ -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/**' @@ -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/**' From c022bffcc1a2f9e941ce931390474165b319b870 Mon Sep 17 00:00:00 2001 From: Sam Wu <22262939+samjwu@users.noreply.github.com> Date: Thu, 3 Oct 2024 07:33:01 -0800 Subject: [PATCH 2/2] Update documentation requirements (#402) * Bump rocm-docs-core to 1.8.2 * Remove empty package-ecosystem in dependabot --- .github/dependabot.yml | 5 ---- docs/sphinx/requirements.in | 2 +- docs/sphinx/requirements.txt | 50 ++++++++++++++++++------------------ 3 files changed, 26 insertions(+), 31 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fe22a4c3d..d24c82f8f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -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 diff --git a/docs/sphinx/requirements.in b/docs/sphinx/requirements.in index b1eb21341..aa0042a51 100644 --- a/docs/sphinx/requirements.in +++ b/docs/sphinx/requirements.in @@ -1 +1 @@ -rocm-docs-core[api_reference]==1.4.1 +rocm-docs-core[api_reference]==1.8.2 diff --git a/docs/sphinx/requirements.txt b/docs/sphinx/requirements.txt index 5ba5428ea..cd2e0a3d8 100644 --- a/docs/sphinx/requirements.txt +++ b/docs/sphinx/requirements.txt @@ -6,9 +6,9 @@ # 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 @@ -16,9 +16,9 @@ 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 @@ -41,7 +41,7 @@ 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 @@ -49,7 +49,7 @@ 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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