diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index 20329783f..e142e7e87 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -49,7 +49,7 @@ jobs: version: "9.1" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive @@ -67,7 +67,7 @@ jobs: - name: Build CI Container timeout-minutes: 45 - uses: nick-fields/retry@v2 + uses: nick-fields/retry@v3 with: retry_wait_seconds: 60 timeout_minutes: 45 @@ -244,7 +244,7 @@ jobs: steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up QEMU uses: docker/setup-qemu-action@v2 @@ -260,7 +260,7 @@ jobs: - name: Build Base Container timeout-minutes: 45 - uses: nick-fields/retry@v2 + uses: nick-fields/retry@v3 with: retry_wait_seconds: 60 timeout_minutes: 45 diff --git a/.github/workflows/cpack.yml b/.github/workflows/cpack.yml index 6de68f43b..9899607f4 100644 --- a/.github/workflows/cpack.yml +++ b/.github/workflows/cpack.yml @@ -140,6 +140,26 @@ jobs: - os-distro: "rhel" os-version: "8.7" rocm-version: "5.7" + # RHEL 8.8 + - os-distro: "rhel" + os-version: "8.8" + rocm-version: "0.0" + - os-distro: "rhel" + os-version: "8.8" + rocm-version: "5.6" + - os-distro: "rhel" + os-version: "8.8" + rocm-version: "5.7" + - os-distro: "rhel" + os-version: "8.8" + rocm-version: "6.0" + # RHEL 8.9 + - os-distro: "rhel" + os-version: "8.9" + rocm-version: "0.0" + - os-distro: "rhel" + os-version: "8.9" + rocm-version: "6.0" # RHEL 9.1 - os-distro: "rhel" os-version: "9.1" @@ -182,7 +202,7 @@ jobs: large-packages: false swap-storage: false - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive @@ -200,21 +220,6 @@ jobs: run: | echo "CI_GENERATOR_ARGS=--generators STGZ" >> $GITHUB_ENV - # - name: Configure Ubuntu Generators - # if: ${{ matrix.os-distro == 'ubuntu' }} - # run: | - # echo "CI_GENERATOR_ARGS=--generators STGZ DEB" >> $GITHUB_ENV - - # - name: Configure OpenSUSE Generators - # if: ${{ matrix.os-distro == 'opensuse' }} - # run: | - # echo "CI_GENERATOR_ARGS=--generators STGZ RPM" >> $GITHUB_ENV - - # - name: Configure RedHat Generators - # if: ${{ matrix.os-distro == 'rhel' }} - # run: | - # echo "CI_GENERATOR_ARGS=--generators STGZ" >> $GITHUB_ENV - - name: Build Base Container timeout-minutes: 30 run: | @@ -236,30 +241,12 @@ jobs: - name: STGZ Artifacts timeout-minutes: 10 - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: omnitrace-stgz-${{ matrix.os-distro }}-${{ matrix.os-version }}-rocm-${{ matrix.rocm-version }}-installer path: | build-release/stgz/*.sh - # - name: DEB Artifacts - # timeout-minutes: 10 - # if: ${{ matrix.os-distro == 'ubuntu' }} - # uses: actions/upload-artifact@v3 - # with: - # name: omnitrace-deb-${{ matrix.os-distro }}-${{ matrix.os-version }}-rocm-${{ matrix.rocm-version }}-installer - # path: | - # build-release/deb/*.deb - - # - name: RPM Artifacts - # timeout-minutes: 10 - # if: ${{ matrix.os-distro == 'opensuse' }} - # uses: actions/upload-artifact@v3 - # with: - # name: omnitrace-rpm-${{ matrix.os-distro }}-${{ matrix.os-version }}-rocm-${{ matrix.rocm-version }}-installer - # path: | - # build-release/rpm/*.rpm - # before testing remove any artifacts of the build - name: Remove Build timeout-minutes: 10 @@ -285,39 +272,3 @@ jobs: fail_on_unmatched_files: True files: | omnitrace-*.sh - - # - name: Test DEB Install - # timeout-minutes: 20 - # if: ${{ matrix.os-distro == 'ubuntu' }} - # run: | - # set -v - # for i in omnitrace_*.deb - # do - # ./docker/test-docker-release.sh --distro ${{ matrix.os-distro }} --versions ${{ matrix.os-version }} --rocm-versions ${{ matrix.rocm-version }} -- --deb ${i} - # done - - # - name: Upload DEB Release Assets - # uses: softprops/action-gh-release@v1 - # if: matrix.os-distro == 'ubuntu' && startsWith(github.ref, 'refs/tags/') && github.repository == 'AMDResearch/omnitrace' - # with: - # fail_on_unmatched_files: True - # files: | - # omnitrace_*.deb - - # - name: Test RPM Install - # timeout-minutes: 20 - # if: ${{ matrix.os-distro == 'opensuse' }} - # run: | - # set -v - # for i in omnitrace-*.rpm - # do - # ./docker/test-docker-release.sh --distro opensuse --versions ${{ matrix.os-version }} --rocm-versions ${{ matrix.rocm-version }} -- --rpm ${i} - # done - - # - name: Upload RPM Release Assets - # uses: softprops/action-gh-release@v1 - # if: matrix.os-distro == 'opensuse' && startsWith(github.ref, 'refs/tags/') && github.repository == 'AMDResearch/omnitrace' - # with: - # fail_on_unmatched_files: True - # files: | - # omnitrace-*.rpm diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 64f1958da..dbfb9887b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -33,11 +33,11 @@ jobs: id-token: write steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Conda uses: s-weigand/setup-conda@v1 - name: Setup Pages - uses: actions/configure-pages@v2 + uses: actions/configure-pages@v5 - name: Create Docs Directory run: mkdir -p docs diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index ae6f10065..6e425d7bd 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -20,9 +20,9 @@ jobs: python-version: [3.8] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install dependencies run: | sudo apt-get update @@ -61,7 +61,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install dependencies run: | DISTRIB_CODENAME=$(cat /etc/lsb-release | grep DISTRIB_CODENAME | awk -F '=' '{print $NF}') @@ -84,7 +84,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: check-includes run: | set +e diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 25e3acf18..068118888 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -25,9 +25,9 @@ jobs: python-version: ["3.7", "3.8", "3.9", "3.10"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/.github/workflows/redhat.yml b/.github/workflows/redhat.yml index 500ca6c6d..c94d08157 100644 --- a/.github/workflows/redhat.yml +++ b/.github/workflows/redhat.yml @@ -56,7 +56,7 @@ jobs: build-type: 'Release' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Configure Env shell: bash @@ -136,7 +136,7 @@ jobs: - name: CTest Artifacts if: failure() continue-on-error: True - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ctest-${{ github.job }}-${{ strategy.job-index }}-log path: | @@ -145,7 +145,7 @@ jobs: - name: Data Artifacts if: failure() continue-on-error: True - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: data-${{ github.job }}-${{ strategy.job-index }}-files path: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9cb738861..5bc2575bf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: packages: write steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Generate generic installer script shell: bash run: | diff --git a/.github/workflows/ubuntu-focal.yml b/.github/workflows/ubuntu-focal.yml index cc765ef4c..e626d32c1 100644 --- a/.github/workflows/ubuntu-focal.yml +++ b/.github/workflows/ubuntu-focal.yml @@ -76,11 +76,11 @@ jobs: static-libstdcxx: 'OFF' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Packages timeout-minutes: 25 - uses: nick-fields/retry@v2 + uses: nick-fields/retry@v3 with: retry_wait_seconds: 30 timeout_minutes: 25 @@ -207,7 +207,7 @@ jobs: - name: CTest Artifacts if: failure() continue-on-error: True - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ctest-${{ github.job }}-${{ strategy.job-index }}-log path: | @@ -216,7 +216,7 @@ jobs: - name: Data Artifacts if: failure() continue-on-error: True - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: data-${{ github.job }}-${{ strategy.job-index }}-files path: | @@ -265,11 +265,11 @@ jobs: OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Packages timeout-minutes: 25 - uses: nick-fields/retry@v2 + uses: nick-fields/retry@v3 with: retry_wait_seconds: 30 timeout_minutes: 25 @@ -373,7 +373,7 @@ jobs: - name: CTest Artifacts if: failure() continue-on-error: True - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ctest-${{ github.job }}-${{ strategy.job-index }}-log path: | @@ -382,7 +382,7 @@ jobs: - name: Data Artifacts if: failure() continue-on-error: True - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: data-${{ github.job }}-${{ strategy.job-index }}-files path: | @@ -428,11 +428,11 @@ jobs: ELFUTILS_DOWNLOAD_VERSION: 0.186 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Packages timeout-minutes: 25 - uses: nick-fields/retry@v2 + uses: nick-fields/retry@v3 with: retry_wait_seconds: 30 timeout_minutes: 25 @@ -545,7 +545,7 @@ jobs: - name: CTest Artifacts if: failure() continue-on-error: True - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ctest-${{ github.job }}-${{ strategy.job-index }}-log path: | @@ -554,7 +554,7 @@ jobs: - name: Data Artifacts if: failure() continue-on-error: True - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: data-${{ github.job }}-${{ strategy.job-index }}-files path: | @@ -582,11 +582,11 @@ jobs: OMNITRACE_CAUSAL_BACKEND: perf steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Packages timeout-minutes: 25 - uses: nick-fields/retry@v2 + uses: nick-fields/retry@v3 with: retry_wait_seconds: 30 timeout_minutes: 25 diff --git a/.github/workflows/ubuntu-jammy.yml b/.github/workflows/ubuntu-jammy.yml index 1c6bb60c0..d37f3fcaa 100644 --- a/.github/workflows/ubuntu-jammy.yml +++ b/.github/workflows/ubuntu-jammy.yml @@ -94,11 +94,11 @@ jobs: OMNITRACE_CI: 'ON' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Packages timeout-minutes: 25 - uses: nick-fields/retry@v2 + uses: nick-fields/retry@v3 with: retry_wait_seconds: 30 timeout_minutes: 25 @@ -116,7 +116,7 @@ jobs: - name: Install ROCm Packages timeout-minutes: 25 if: ${{ matrix.rocm-version != '0.0' }} - uses: nick-fields/retry@v2 + uses: nick-fields/retry@v3 with: retry_wait_seconds: 30 timeout_minutes: 25 @@ -227,7 +227,7 @@ jobs: - name: CTest Artifacts if: failure() continue-on-error: True - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ctest-${{ github.job }}-${{ strategy.job-index }}-log path: | @@ -236,7 +236,7 @@ jobs: - name: Data Artifacts if: failure() continue-on-error: True - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: data-${{ github.job }}-${{ strategy.job-index }}-files path: | diff --git a/VERSION b/VERSION index 720c7384c..ca7176690 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.11.1 +1.11.2 diff --git a/docker/Dockerfile.opensuse b/docker/Dockerfile.opensuse index f8b354393..938c329b7 100644 --- a/docker/Dockerfile.opensuse +++ b/docker/Dockerfile.opensuse @@ -13,6 +13,13 @@ SHELL [ "/bin/bash", "-c" ] ENV PATH /usr/local/bin:${PATH} ENV LIBRARY_PATH ${LIBRARY_PATH}:/opt/amdgpu/lib64 +RUN set +e; \ + zypper --non-interactive -i --gpg-auto-import-keys refresh; \ + zypper --non-interactive -i patch; \ + zypper --non-interactive -i patch; \ + zypper --non-interactive -i --gpg-auto-import-keys refresh; \ + exit 0 + RUN zypper --non-interactive update -y && \ zypper --non-interactive dist-upgrade -y && \ zypper --non-interactive install -y -t pattern devel_basis && \ diff --git a/docker/Dockerfile.opensuse.ci b/docker/Dockerfile.opensuse.ci index 92c7fabe2..4d0718287 100644 --- a/docker/Dockerfile.opensuse.ci +++ b/docker/Dockerfile.opensuse.ci @@ -16,6 +16,13 @@ ARG EXTRA_PACKAGES="" ARG ELFUTILS_DOWNLOAD_VERSION="0.186" ARG NJOBS="12" +RUN set +e; \ + zypper --non-interactive -i --gpg-auto-import-keys refresh; \ + zypper --non-interactive -i patch; \ + zypper --non-interactive -i patch; \ + zypper --non-interactive -i --gpg-auto-import-keys refresh; \ + exit 0 + RUN zypper --non-interactive update -y && \ zypper --non-interactive dist-upgrade -y && \ zypper --non-interactive install -y -t pattern devel_basis && \ diff --git a/docker/build-docker.sh b/docker/build-docker.sh index faa2cb8d0..beafa2da3 100755 --- a/docker/build-docker.sh +++ b/docker/build-docker.sh @@ -257,11 +257,10 @@ do send-error "Unsupported combination :: ${DISTRO}-${VERSION} + ROCm ${ROCM_VERSION}" ;; esac - PERL_REPO="SLE_${VERSION_MAJOR}_SP${VERSION_MINOR}" - if [ "${VERSION_MAJOR}" -ge 15 ]; then - if [ "${VERSION_MINOR}" -ge 4 ]; then - PERL_REPO="${VERSION_MAJOR}.${VERSION_MINOR}" - fi + if [[ "${VERSION_MAJOR}" -le 15 && "${VERSION_MINOR}" -le 5 ]]; then + PERL_REPO="15.6" + else + PERL_REPO="${VERSION_MAJOR}.${VERSION_MINOR}" fi verbose-build docker build . ${PULL} --progress plain -f ${DOCKER_FILE} --tag ${CONTAINER} --build-arg DISTRO=${DISTRO_IMAGE} --build-arg VERSION=${VERSION} --build-arg ROCM_VERSION=${ROCM_VERSION} --build-arg AMDGPU_RPM=${ROCM_RPM} --build-arg PERL_REPO=${PERL_REPO} --build-arg PYTHON_VERSIONS=\"${PYTHON_VERSIONS}\" fi