Remove dev and main branch from workflows. (ROCm#404)

* Remove `dev` and `main` branch from workflows. Update links in documentation. Signed-off-by: David Galiffi <David.Galiffi@amd.com> * `amd-staging` -> `amd-mainline` in docs Signed-off-by: Peter Jun Park <peter.park@amd.com> --------- Signed-off-by: David Galiffi <David.Galiffi@amd.com> Signed-off-by: Peter Jun Park <peter.park@amd.com> Co-authored-by: Peter Jun Park <peter.park@amd.com> Signed-off-by: xuchen-amd <xuchen@amd.com>
xuchen-amd · Oct 28, 2024 · 2f32695 · 2f32695
1 parent 32632a1
commit 2f32695
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 54 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -2,11 +2,7 @@ name: Documentation
 
 on:
   push:
-<<<<<<< HEAD
     branches: [ amd-mainline ]
-=======
-    branches: [ main, amd-mainline ]
->>>>>>> c3ce1aae (Prep work for branch renaming (#389))
     paths:
       - 'docs/archive/docs-2.x/**'
       - 'docs/archive/docs-1.x/**'
@@ -40,10 +36,6 @@ jobs:
       - name: Build 1.x docs
         run: |
           cd docs/archive/docs-1.x
-<<<<<<< HEAD
-          cd docs/archive/docs-1.x
-=======
->>>>>>> c3ce1aae (Prep work for branch renaming (#389))
           make html
       - name: Build 2.x docs
         run: |

diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
@@ -3,15 +3,9 @@ name: Formatting
 
 on:
   push:
-<<<<<<< HEAD
-    branches: [ amd-mainline, amd-staging, release/** ]
+    branches: [ amd-mainline, amd-staging ]
   pull_request:
-    branches: [ amd-mainline, amd-staging, release/** ]
-=======
-    branches: [ main, dev, amd-mainline, amd-staging ]
-  pull_request:
-    branches: [ main, dev, amd-mainline, amd-staging ]
->>>>>>> c3ce1aae (Prep work for branch renaming (#389))
+    branches: [ amd-mainline, amd-staging ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.github/workflows/mi-rhel9.yml b/.github/workflows/mi-rhel9.yml
@@ -2,11 +2,7 @@ name: mi-rhel9
 
 on:
   push:
-<<<<<<< HEAD
-    branches: [ amd-mainline, release/** ]
-=======
-    branches: [ main, amd-mainline ]
->>>>>>> c3ce1aae (Prep work for branch renaming (#389))
+    branches: [ amd-mainline ]
 
   # Allows manual execution
   workflow_dispatch:

diff --git a/.github/workflows/rhel-8.yml b/.github/workflows/rhel-8.yml
@@ -5,15 +5,9 @@ name: RHEL 8
 # Controls when the workflow will run
 on:
   push:
-<<<<<<< HEAD
-    branches: [ amd-mainline, amd-staging, release/** ]
+    branches: [ amd-mainline, amd-staging ]
   pull_request:
-    branches: [ amd-mainline, amd-staging, release/** ]
-=======
-    branches: [ main, dev, amd-mainline, amd-staging ]
-  pull_request:
-    branches: [ main, dev, amd-mainline, amd-staging ]
->>>>>>> c3ce1aae (Prep work for branch renaming (#389))
+    branches: [ amd-mainline, amd-staging ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml
@@ -2,11 +2,7 @@ name: tarball
 
 on:
   push:
-<<<<<<< HEAD
-    branches: [ amd-mainline, release/** ]
-=======
-    branches: [ main, amd-mainline ]
->>>>>>> c3ce1aae (Prep work for branch renaming (#389))
+    branches: [ amd-mainline ]
   pull_request:
 
 concurrency:
@@ -103,15 +99,8 @@ jobs:
       - name: Access rocprofiler-compute using modulefile
         run: |
           . /etc/profile.d/lmod.sh
-<<<<<<< HEAD
           module use $INSTALL_DIR/rocprofiler-compute/share/rocprofiler-compute/modulefiles
           module load rocprofiler-compute
           module list
           rocprof-compute --version
-=======
-          module use $INSTALL_DIR/omniperf/share/omniperf/modulefiles
-          module load omniperf
-          module list
-          omniperf --version
->>>>>>> c3ce1aae (Prep work for branch renaming (#389))
 
diff --git a/.github/workflows/ubuntu-jammy.yml b/.github/workflows/ubuntu-jammy.yml
@@ -4,15 +4,9 @@ name: Ubuntu 22.04
 
 on:
   push:
-<<<<<<< HEAD
-    branches: [ amd-mainline, amd-staging, release/** ]
+    branches: [ amd-mainline, amd-staging ]
   pull_request:
-    branches: [ amd-mainline, amd-staging, release/** ]
-=======
-    branches: [ main, dev, amd-mainline, amd-staging ]
-  pull_request:
-    branches: [ main, dev, amd-mainline, amd-staging ]
->>>>>>> c3ce1aae (Prep work for branch renaming (#389))
+    branches: [ amd-mainline, amd-staging ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,7 +55,7 @@
 
 # frequently used external resources
 extlinks = {
-    "dev-sample": ("https://github.com/ROCm/omniperf/blob/dev/sample/%s", "%s"),
+    "dev-sample": ("https://github.com/ROCm/omniperf/blob/amd-mainline/sample/%s", "%s"),
     "prod-page": (
         "https://www.amd.com/en/products/accelerators/instinct/%s.html",
         "%s",

diff --git a/docs/how-to/analyze/cli.rst b/docs/how-to/analyze/cli.rst
@@ -186,7 +186,7 @@ Walkthrough
 
 3. Choose your own customized subset of metrics with the ``-b`` (or ``--block``)
    option. Or, build your own configuration following
-   `config_template <https://github.com/ROCm/omniperf/blob/main/src/omniperf_soc/analysis_configs/panel_config_template.yaml>`_.
+   `config_template <https://github.com/ROCm/omniperf/blob/amd-mainline/src/omniperf_soc/analysis_configs/panel_config_template.yaml>`_.
    The following snippet shows how to generate a report containing only metric 2
    (:doc:`System Speed-of-Light </conceptual/system-speed-of-light>`).
 

diff --git a/docs/how-to/profile/mode.rst b/docs/how-to/profile/mode.rst
@@ -38,7 +38,7 @@ Run ``omniperf profile -h`` for more details. See
 Profiling example
 -----------------
 
-The `<https://github.com/ROCm/omniperf/blob/main/sample/vcopy.cpp>`__ repository
+The `<https://github.com/ROCm/omniperf/blob/amd-mainline/sample/vcopy.cpp>`__ repository
 includes source code for a sample GPU compute workload, ``vcopy.cpp``. A copy of
 this file is available in the ``share/sample`` subdirectory after a normal
 Omniperf installation, or via the ``$OMNIPERF_SHARE/sample`` directory when

diff --git a/docs/tutorial/includes/vector-memory-operation-counting.rst b/docs/tutorial/includes/vector-memory-operation-counting.rst
@@ -623,7 +623,7 @@ manner. See
 for further reading on this instruction type.
 
 We develop a `simple
-kernel <https://github.com/ROCm/omniperf/blob/dev/sample/stack.hip>`__
+kernel <https://github.com/ROCm/omniperf/blob/amd-mainline/sample/stack.hip>`__
 that uses stack memory:
 
 .. code-block:: cpp

diff --git a/docs/tutorial/profiling-by-example.rst b/docs/tutorial/profiling-by-example.rst
@@ -7,7 +7,7 @@ Profiling by example
 ********************
 
 The following examples refer to sample :doc:`HIP <hip:index>` code located in
-:fab:`github` :dev-sample:`ROCm/omniperf/blob/dev/sample <>` and distributed
+:fab:`github` :dev-sample:`ROCm/omniperf/blob/amd-mainline/sample <>` and distributed
 as part of Omniperf.
 
 .. include:: ./includes/valu-arithmetic-instruction-mix.rst