diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 7b5f30bbcc..81a46cf8b0 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -2,7 +2,7 @@ name: Documentation on: push: - branches: ["main"] + branches: [ main, amd-mainline ] paths: - 'docs/archive/docs-2.x/**' - 'docs/archive/docs-1.x/**' @@ -36,7 +36,7 @@ jobs: - name: Build 1.x docs run: | cd docs/archive/docs-1.x - make html + make html - name: Build 2.x docs run: | cd docs/archive/docs-2.x diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index bb7fcbb955..8f4bda4453 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -3,9 +3,9 @@ name: Formatting on: push: - branches: [ main, dev, 2.x ] + branches: [ main, dev, amd-mainline, amd-staging ] pull_request: - branches: [ main, dev, 2.x ] + branches: [ main, dev, amd-mainline, amd-staging ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/mi-rhel9.yml b/.github/workflows/mi-rhel9.yml index 8cd2a8d627..a500d2bc02 100644 --- a/.github/workflows/mi-rhel9.yml +++ b/.github/workflows/mi-rhel9.yml @@ -2,11 +2,10 @@ name: mi-rhel9 on: push: - branches: - - 'main' + branches: [ main, amd-mainline ] # Allows manual execution - workflow_dispatch: + workflow_dispatch: permissions: contents: read diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 13d51e0688..f1244bcd8b 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -8,7 +8,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true - + jobs: distbuild: runs-on: ubuntu-latest diff --git a/.github/workflows/rhel-8.yml b/.github/workflows/rhel-8.yml index aa4e0a7b8a..278fbaa5f2 100644 --- a/.github/workflows/rhel-8.yml +++ b/.github/workflows/rhel-8.yml @@ -5,9 +5,9 @@ name: RHEL 8 # Controls when the workflow will run on: push: - branches: [ main, dev ] + branches: [ main, dev, amd-mainline, amd-staging ] pull_request: - branches: [ main, dev ] + branches: [ main, dev, 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 index 68ea545799..8958c076d7 100644 --- a/.github/workflows/tarball.yml +++ b/.github/workflows/tarball.yml @@ -2,15 +2,13 @@ name: tarball on: push: - branches: - - main - - 2.x + branches: [ main, amd-mainline ] pull_request: concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true - + jobs: distbuild: runs-on: ubuntu-latest @@ -25,7 +23,7 @@ jobs: echo "sha=${{github.event.pull_request.head.sha}}" >> $GITHUB_OUTPUT else echo "sha=$GITHUB_SHA" >> $GITHUB_OUTPUT - fi + fi - name: Checkout code uses: actions/checkout@v4 with: @@ -101,9 +99,9 @@ jobs: run: sudo apt-get install -y lmod - name: Access omniperf using modulefile run: | - . /etc/profile.d/lmod.sh + . /etc/profile.d/lmod.sh module use $INSTALL_DIR/omniperf/share/omniperf/modulefiles module load omniperf module list omniperf --version - + diff --git a/.github/workflows/ubuntu-jammy.yml b/.github/workflows/ubuntu-jammy.yml index 2aa63924ae..cb76dd4977 100644 --- a/.github/workflows/ubuntu-jammy.yml +++ b/.github/workflows/ubuntu-jammy.yml @@ -4,9 +4,9 @@ name: Ubuntu 22.04 on: push: - branches: [ main, dev ] + branches: [ main, dev, amd-mainline, amd-staging ] pull_request: - branches: [ main, dev ] + branches: [ main, dev, amd-mainline, amd-staging ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index af9b5d926b..f18ea2ca24 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,12 +1,12 @@ ## How to fork from us -To keep our development fast and conflict free, we recommend you to [fork](https://github.com/ROCm/omniperf/fork) our repository and start your work from our `dev` branch in your private repository. +To keep our development fast and conflict free, we recommend you to [fork](https://github.com/ROCm/omniperf/fork) our repository and start your work from our `amd-staging` branch in your private repository. Afterwards, git clone your repository to your local machine. But that is not it! To keep track of the original develop repository, add it as another remote. ``` git remote add mainline https://github.com/ROCm/omniperf.git -git checkout dev +git checkout amd-staging ``` As always in git, start a new branch with @@ -31,9 +31,9 @@ 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. -- Ensure the PR is based on the `dev` branch of the Omniperf GitHub repository. +- 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](https://github.com/ROCm/omniperf/blob/main/LICENSE): +- 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): > (a) The contribution was created in whole or in part by me and I diff --git a/README.md b/README.md index cc8cc8b0d1..adbcb9ce3c 100644 --- a/README.md +++ b/README.md @@ -29,10 +29,10 @@ contribution process. Omniperf follows a [main-dev](https://nvie.com/posts/a-successful-git-branching-model/) branching model. As a result, our latest stable release is shipped -from the `main` branch, while new features are developed in our -`dev` branch. +from the `amd-mainline` branch, while new features are developed in our +`amd-staging` branch. -Users may checkout `dev` to preview upcoming features. +Users may checkout `amd-staging` to preview upcoming features. ## How to Cite