From 4306e4e53882ad5a709de74e9bf529dafdd02cd2 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Thu, 31 Oct 2024 16:28:50 -0400 Subject: [PATCH] Use V47 trace_processor_shell for certain OS releases. RedHat 8, SUSE 15.5, and Ubuntu 20.04 are no longer compatible with the latest trace_processor_shell. Incompatible version of GLIBC. --- .github/workflows/opensuse.yml | 6 ++++-- .github/workflows/redhat.yml | 8 +++++--- .github/workflows/ubuntu-jammy.yml | 2 -- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/opensuse.yml b/.github/workflows/opensuse.yml index 185d1859..42ab253e 100644 --- a/.github/workflows/opensuse.yml +++ b/.github/workflows/opensuse.yml @@ -58,8 +58,10 @@ jobs: timeout_minutes: 25 max_attempts: 5 command: | - wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin && - chmod +x /opt/trace_processor/bin/trace_processor_shell + if [ "${{ matrix.os-release }}" == "15.5" ]; then + wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin && + chmod +x /opt/trace_processor/bin/trace_processor_shell + fi python3 -m pip install --upgrade pip && python3 -m pip install numpy perfetto dataclasses && for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done diff --git a/.github/workflows/redhat.yml b/.github/workflows/redhat.yml index 34293d37..6f6b336c 100644 --- a/.github/workflows/redhat.yml +++ b/.github/workflows/redhat.yml @@ -56,13 +56,16 @@ jobs: run: echo "CC=$(echo '${{ matrix.compiler }}' | sed 's/+/c/g')" >> $GITHUB_ENV && echo "CXX=${{ matrix.compiler }}" >> $GITHUB_ENV && + echo "OS_VERSION_MAJOR=$(cat /etc/os-release | grep 'VERSION_ID' | sed 's/=/ /1' | awk '{print $NF}' | sed 's/"//g' | sed 's/\./ /g' | awk '{print $1}')" >> $GITHUB_ENV && env - name: Install Packages shell: bash run: | - wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin && - chmod +x /opt/trace_processor/bin/trace_processor_shell + if [ $OS_VERSION_MAJOR -eq 8 ]; then + wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin && + chmod +x /opt/trace_processor/bin/trace_processor_shell + fi python3 -m pip install --upgrade pip && python3 -m pip install numpy perfetto dataclasses && for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done @@ -72,7 +75,6 @@ jobs: timeout-minutes: 30 shell: bash run: | - OS_VERSION_MAJOR=$(cat /etc/os-release | grep 'VERSION_ID' | sed 's/=/ /1' | awk '{print $NF}' | sed 's/"//g' | sed 's/\./ /g' | awk '{print $1}') RPM_TAG=".el${OS_VERSION_MAJOR}" ROCM_VERSION=${{ matrix.rocm-version }} ROCM_MAJOR=$(echo ${ROCM_VERSION} | sed 's/\./ /g' | awk '{print $1}') diff --git a/.github/workflows/ubuntu-jammy.yml b/.github/workflows/ubuntu-jammy.yml index 9c6945ae..78574f03 100644 --- a/.github/workflows/ubuntu-jammy.yml +++ b/.github/workflows/ubuntu-jammy.yml @@ -110,8 +110,6 @@ jobs: apt-get install -y software-properties-common && apt-get upgrade -y && apt-get install -y autoconf bison build-essential clang environment-modules gettext libfabric-dev libiberty-dev libomp-dev libopenmpi-dev libtool m4 openmpi-bin python3-pip texinfo ${{ matrix.compiler }} && - wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v47.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin && - chmod +x /opt/trace_processor/bin/trace_processor_shell && python3 -m pip install --upgrade pip && python3 -m pip install numpy perfetto dataclasses && for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done