From 8f9dcffae444bafa3bf383921cc1ba113942e711 Mon Sep 17 00:00:00 2001 From: "Jonathan R. Madsen" Date: Fri, 21 Oct 2022 06:21:00 -0500 Subject: [PATCH] Update containers workflow (#182) * Bump version to 1.7.2 * Update containers workflow [ROCm/rocprofiler-systems commit: 5bb7359b816b54b34d1c47696fe87eb540204583] --- .../.github/workflows/containers.yml | 140 ++++++++++-------- projects/rocprofiler-systems/VERSION | 2 +- 2 files changed, 80 insertions(+), 62 deletions(-) diff --git a/projects/rocprofiler-systems/.github/workflows/containers.yml b/projects/rocprofiler-systems/.github/workflows/containers.yml index 4593c9dbd8..52f465b227 100644 --- a/projects/rocprofiler-systems/.github/workflows/containers.yml +++ b/projects/rocprofiler-systems/.github/workflows/containers.yml @@ -4,7 +4,7 @@ run-name: ci-containers # nightly build on: schedule: - - cron: 0 3 * * * + - cron: 0 1 * * * concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -61,7 +61,7 @@ jobs: ./build-docker-ci.sh --distro ${{ matrix.distro }} --versions ${{ matrix.version }} --user ${{ secrets.DOCKERHUB_USERNAME }} --push --jobs 2 --elfutils-version 0.186 --boost-version 1.79.0 popd - omnitrace-release-ubuntu: + omnitrace-release: if: github.repository == 'AMDResearch/omnitrace' runs-on: ubuntu-20.04 @@ -69,57 +69,84 @@ jobs: strategy: fail-fast: false matrix: - os: ["18.04", "20.04"] - rocm-version: ["0.0", "4.5", "5.0", "5.1", "5.2"] - default-rocm: ["5.0"] - - steps: - - uses: actions/checkout@v3 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build Base Container - if: ${{ matrix.rocm-version == 0 }} - timeout-minutes: 45 - run: | - pushd docker - ./build-docker.sh --distro ubuntu --versions ${{ matrix.os }} --rocm-versions ${{ matrix.default-rocm }} --user ${{ secrets.DOCKERHUB_USERNAME }} --push - popd - - - name: Build Base Container - if: ${{ matrix.rocm-version > 0 }} - timeout-minutes: 45 - run: | - pushd docker - ./build-docker.sh --distro ubuntu --versions ${{ matrix.os }} --rocm-versions ${{ matrix.rocm-version }} --user ${{ secrets.DOCKERHUB_USERNAME }} --push - popd - - omnitrace-release-opensuse: - if: github.repository == 'AMDResearch/omnitrace' - - runs-on: ubuntu-20.04 - - strategy: - fail-fast: false - matrix: - os: ["15.2", "15.3"] - rocm-version: ["0.0", "4.5", "5.0", "5.1", "5.2"] - default-rocm: ["5.0"] - exclude: - - os: "15.2" + include: + # ubuntu 18.04 + - os-distro: "ubuntu" + os-version: "18.04" + rocm-version: "0.0" + - os-distro: "ubuntu" + os-version: "18.04" + rocm-version: "4.5" + - os-distro: "ubuntu" + os-version: "18.04" + rocm-version: "5.0" + - os-distro: "ubuntu" + os-version: "18.04" rocm-version: "5.1" - - os: "15.2" + - os-distro: "ubuntu" + os-version: "18.04" rocm-version: "5.2" + # ubuntu 20.04 + - os-distro: "ubuntu" + os-version: "20.04" + rocm-version: "0.0" + - os-distro: "ubuntu" + os-version: "20.04" + rocm-version: "4.5" + - os-distro: "ubuntu" + os-version: "20.04" + rocm-version: "5.0" + - os-distro: "ubuntu" + os-version: "20.04" + rocm-version: "5.1" + - os-distro: "ubuntu" + os-version: "20.04" + rocm-version: "5.2" + - os-distro: "ubuntu" + os-version: "20.04" + rocm-version: "5.3" + # ubuntu 20.04 + - os-distro: "ubuntu" + os-version: "22.04" + rocm-version: "0.0" + - os-distro: "ubuntu" + os-version: "22.04" + rocm-version: "5.3" + # opensuse 15.3 + - os-distro: "opensuse" + os-version: "15.3" + rocm-version: "0.0" + - os-distro: "opensuse" + os-version: "15.3" + rocm-version: "4.5" + - os-distro: "opensuse" + os-version: "15.3" + rocm-version: "5.0" + - os-distro: "opensuse" + os-version: "15.3" + rocm-version: "5.1" + - os-distro: "opensuse" + os-version: "15.3" + rocm-version: "5.2" + - os-distro: "opensuse" + os-version: "15.3" + rocm-version: "5.3" + # opensuse 15.4 + - os-distro: "opensuse" + os-version: "15.4" + rocm-version: "0.0" + - os-distro: "opensuse" + os-version: "15.4" + rocm-version: "5.0" + - os-distro: "opensuse" + os-version: "15.4" + rocm-version: "5.1" + - os-distro: "opensuse" + os-version: "15.4" + rocm-version: "5.2" + - os-distro: "opensuse" + os-version: "15.4" + rocm-version: "5.3" steps: - uses: actions/checkout@v3 @@ -137,17 +164,8 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build Base Container - if: ${{ matrix.rocm-version == 0 }} timeout-minutes: 45 run: | pushd docker - ./build-docker.sh --distro opensuse --versions ${{ matrix.os }} --rocm-versions ${{ matrix.default-rocm }} --user ${{ secrets.DOCKERHUB_USERNAME }} --push - popd - - - name: Build Base Container - if: ${{ matrix.rocm-version > 0 }} - timeout-minutes: 45 - run: | - pushd docker - ./build-docker.sh --distro opensuse --versions ${{ matrix.os }} --rocm-versions ${{ matrix.rocm-version }} --user ${{ secrets.DOCKERHUB_USERNAME }} --push + ./build-docker.sh --distro ${{ matrix.os-distro }} --versions ${{ matrix.os-version }} --rocm-versions ${{ matrix.rocm-version }} --user ${{ secrets.DOCKERHUB_USERNAME }} --push popd diff --git a/projects/rocprofiler-systems/VERSION b/projects/rocprofiler-systems/VERSION index 943f9cbc4e..f8a696c8dc 100644 --- a/projects/rocprofiler-systems/VERSION +++ b/projects/rocprofiler-systems/VERSION @@ -1 +1 @@ -1.7.1 +1.7.2