Skip to content

Commit

Permalink
Prep work for branch renaming (ROCm#389)
Browse files Browse the repository at this point in the history
* Add `amd-staging` and `amd-mainline` to workflow.
* Update branch names in documentation
* Change `dev` to `amd-staging` and `main` to `amd-mainline` in documentation.
* Remove references from 2.x from workflows.
* Convert the link to LICENSE to a relative path in CONTRIBUTING.

---------

Signed-off-by: David Galiffi <David.Galiffi@amd.com>
Signed-off-by: xuchen-amd <xuchen@amd.com>
  • Loading branch information
dgaliffiAMD authored and xuchen-amd committed Oct 29, 2024
1 parent e6f85e6 commit db0dcb8
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ 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/**'
Expand Down Expand Up @@ -36,7 +40,10 @@ 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: |
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,15 @@ name: Formatting

on:
push:
<<<<<<< HEAD
branches: [ amd-mainline, amd-staging, release/** ]
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))

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

on:
push:
<<<<<<< HEAD
branches: [ amd-mainline, release/** ]
=======
branches: [ main, amd-mainline ]
>>>>>>> c3ce1aae (Prep work for branch renaming (#389))

# Allows manual execution
workflow_dispatch:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/rhel-8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,15 @@ name: RHEL 8
# Controls when the workflow will run
on:
push:
<<<<<<< HEAD
branches: [ amd-mainline, amd-staging, release/** ]
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))

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/tarball.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ name: tarball

on:
push:
<<<<<<< HEAD
branches: [ amd-mainline, release/** ]
=======
branches: [ main, amd-mainline ]
>>>>>>> c3ce1aae (Prep work for branch renaming (#389))
pull_request:

concurrency:
Expand Down Expand Up @@ -99,8 +103,15 @@ 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))

6 changes: 6 additions & 0 deletions .github/workflows/ubuntu-jammy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,15 @@ name: Ubuntu 22.04

on:
push:
<<<<<<< HEAD
branches: [ amd-mainline, amd-staging, release/** ]
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))

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down
10 changes: 10 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,19 @@ and apply your changes there.

- Ensure the PR description clearly describes the problem and solution. If there is an existing GitHub issue open describing this bug, please include it in the description so we can close it.

<<<<<<< HEAD
- Ensure the PR is based on the `amd-staging` branch of the ROCm Compute Profiler GitHub repository.

<<<<<<< HEAD
- ROCm Compute Profiler requires new commits to include a "Signed-off-by" token in the commit message (typically enabled via the `git commit -s` option), indicating your agreement to the projects's [Developer's Certificate of Origin](https://developercertificate.org/) and compatability with the project [LICENSE](LICENSE):
=======
- ROCm Compute Profiler requires new commits to include a "Signed-off-by" token in the commit message (typically enabled via the `git commit -s` option), indicating your agreement to the projects's [Developer's Certificate of Origin](https://developercertificate.org/) and compatability with the project [LICENSE](https://github.com/ROCm/rocprofiler-compute/blob/main/LICENSE):
=======
- Ensure the PR is based on the `amd-staging` branch of the Omniperf GitHub repository.

- Omniperf requires new commits to include a "Signed-off-by" token in the commit message (typically enabled via the `git commit -s` option), indicating your agreement to the projects's [Developer's Certificate of Origin](https://developercertificate.org/) and compatability with the project [LICENSE](LICENSE):
>>>>>>> c3ce1aae (Prep work for branch renaming (#389))
>>>>>>> fb4a5d56 (Prep work for branch renaming (#389))

> (a) The contribution was created in whole or in part by me and I
Expand Down

0 comments on commit db0dcb8

Please sign in to comment.