From d640e86469866db3d109c4f536374078a5082fbe Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Fri, 27 Sep 2024 20:49:33 -0400 Subject: [PATCH 1/3] Update Workflows Signed-off-by: David Galiffi --- .github/workflows/containers.yml | 2 +- .github/workflows/docs.yml | 4 ++-- .github/workflows/formatting.yml | 4 ++-- .github/workflows/release.yml | 3 ++- .github/workflows/ubuntu-focal.yml | 4 ++-- .github/workflows/ubuntu-jammy.yml | 4 ++-- 6 files changed, 11 insertions(+), 10 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/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/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 de484b6c761aabcb42ba3dc788e82252ca8d146c Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Fri, 27 Sep 2024 21:14:50 -0400 Subject: [PATCH 2/3] Fix branches Signed-off-by: David Galiffi --- .github/workflows/cpack.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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/**' From 79beff62e00a803e7989a97d43a02e001f54e5d8 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Sat, 28 Sep 2024 23:13:30 -0400 Subject: [PATCH 3/3] Clean up workflows Remove references to "main" and "develop" branches. --- .github/workflows/opensuse.yml | 4 ++-- .github/workflows/redhat.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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/**'