From a5ee519a82537b234509608865c393f41f3ea715 Mon Sep 17 00:00:00 2001 From: Alex Cockrean <84676155+ABenC377@users.noreply.github.com> Date: Thu, 5 Dec 2024 16:16:07 +0000 Subject: [PATCH 1/5] Removing ubuntu18/gcc7 combo --- .github/actions/setup_gcc_ubuntu/action.yml | 8 +------- .github/workflows/LINUX_BUILD_TEST.yml | 18 ++---------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/.github/actions/setup_gcc_ubuntu/action.yml b/.github/actions/setup_gcc_ubuntu/action.yml index f5325dc747..a1778ded32 100644 --- a/.github/actions/setup_gcc_ubuntu/action.yml +++ b/.github/actions/setup_gcc_ubuntu/action.yml @@ -59,14 +59,8 @@ runs: - name: Install cmake via apt shell: bash run: | - if [[ ${{ inputs.OS == 'ubuntu:18.04' }} ]]; then - NAME=bionic - else - NAME=focal - fi - wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ - apt-add-repository "deb https://apt.kitware.com/ubuntu/ $NAME main" && \ + apt-add-repository "deb https://apt.kitware.com/ubuntu/ focal main" && \ apt update && apt install cmake -y apt upgrade -y diff --git a/.github/workflows/LINUX_BUILD_TEST.yml b/.github/workflows/LINUX_BUILD_TEST.yml index e871acff89..511fdf2cab 100644 --- a/.github/workflows/LINUX_BUILD_TEST.yml +++ b/.github/workflows/LINUX_BUILD_TEST.yml @@ -37,13 +37,6 @@ jobs: - OS: 'ubuntu:20.04' COMPILER: 'gcc-7' - - OS: 'ubuntu:18.04' - COMPILER: 'gcc-8' - - OS: 'ubuntu:18.04' - COMPILER: 'gcc-9' - - OS: 'ubuntu:18.04' - COMPILER: 'gcc-10' - # need redhat 8 for gcc 7 and 8 | redhat 9 for gcc 9 and 10 - OS: 'redhat/ubi8:latest' COMPILER: gcc-9 @@ -77,16 +70,9 @@ jobs: steps: ####################################### - # Clones repo to workspace. (ubuntu 18 is missing correct glibc version - # for newer checkout action version i.e. use older checkout version) - # NOTE: may want to remove support for gcc-7 soon + # Clones repo to workspace ####################################### - - if: ${{ contains(fromJson('["ubuntu:18.04"]'), matrix.OS) }} - name: checkout v3 - uses: actions/checkout@v3 - - - if: ${{ !contains(fromJson('["ubuntu:18.04"]'), matrix.OS) }} - name: checkout v4 + - name: checkout v4 uses: actions/checkout@v4 ####################################### From 83e1a28910969d33f871a7f4560f9d98f56c221d Mon Sep 17 00:00:00 2001 From: Alex Cockrean <84676155+ABenC377@users.noreply.github.com> Date: Thu, 5 Dec 2024 16:19:11 +0000 Subject: [PATCH 2/5] Removing ubuntu18/gcc7 combo --- .github/workflows/LINUX_BUILD_TEST.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/LINUX_BUILD_TEST.yml b/.github/workflows/LINUX_BUILD_TEST.yml index 511fdf2cab..60857445a0 100644 --- a/.github/workflows/LINUX_BUILD_TEST.yml +++ b/.github/workflows/LINUX_BUILD_TEST.yml @@ -27,7 +27,7 @@ jobs: matrix: COMPILER: ['gcc-7', 'gcc-8', 'gcc-9', 'gcc-10'] # todo 'armclang'] # compiler names - OS: ['ubuntu:18.04','ubuntu:20.04', 'rockylinux:8', 'redhat/ubi8:latest', 'redhat/ubi9:latest', 'debian:10', 'debian:11'] # Docker images + OS: ['ubuntu:20.04', 'rockylinux:8', 'redhat/ubi8:latest', 'redhat/ubi9:latest', 'debian:10', 'debian:11'] # Docker images ####################################### # Removes unecessary jobs as jobs are generated in the order seen in the matrix. From 1e315bec939563607cfdabddf8b98e89c3ab8c9a Mon Sep 17 00:00:00 2001 From: Alex Cockrean <84676155+ABenC377@users.noreply.github.com> Date: Thu, 5 Dec 2024 17:07:46 +0000 Subject: [PATCH 3/5] Removing checkoutv3 throughout --- .github/workflows/LINUX_BUILD_TEST.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/LINUX_BUILD_TEST.yml b/.github/workflows/LINUX_BUILD_TEST.yml index 60857445a0..5195b8fa06 100644 --- a/.github/workflows/LINUX_BUILD_TEST.yml +++ b/.github/workflows/LINUX_BUILD_TEST.yml @@ -145,16 +145,7 @@ jobs: # in the actions interface ####################################### - - if: ${{ contains(fromJson('["ubuntu:18.04"]'), matrix.OS) && inputs.SIMENG-MODE == 'Release' }} - name: Checking out benchmark repository (v3) - uses: actions/checkout@v3 - with: - repository: UoB-HPC/simeng-benchmarks - token: ${{ env.PAT }} - ref: makefile-build-system - path: simeng-benchmarks - - - if: ${{ !contains(fromJson('["ubuntu:18.04"]'), matrix.OS) && inputs.SIMENG-MODE == 'Release' }} + - if: ${{ inputs.SIMENG-MODE == 'Release' }} name: Checking out benchmark repository (v4) uses: actions/checkout@v4 with: From dbc091eefee0fc7de1e185c1cc05730f35a45787 Mon Sep 17 00:00:00 2001 From: Alex Cockrean <84676155+ABenC377@users.noreply.github.com> Date: Thu, 12 Dec 2024 10:39:03 +0000 Subject: [PATCH 4/5] Trying to get GCC7 working on Ubuntu 20 --- .github/actions/setup_gcc_ubuntu/action.yml | 3 +++ .github/workflows/LINUX_BUILD_TEST.yml | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup_gcc_ubuntu/action.yml b/.github/actions/setup_gcc_ubuntu/action.yml index a1778ded32..ae5226d972 100644 --- a/.github/actions/setup_gcc_ubuntu/action.yml +++ b/.github/actions/setup_gcc_ubuntu/action.yml @@ -70,6 +70,9 @@ runs: - name: Install gcc shell: bash run: | + if [[ ${{ inputs.gcc-version == 'gcc-7' }} ]]; then + echo "deb http://archive.ubuntu.com/ubuntu focal main universe" >> "/etc/apt/sources.list" + fi apt-get -y install ${{ inputs.gcc-version }} apt-get -y install g++-$( echo ${{ inputs.gcc-version }} | cut -d '-' -f 2) apt update && apt upgrade -y diff --git a/.github/workflows/LINUX_BUILD_TEST.yml b/.github/workflows/LINUX_BUILD_TEST.yml index 5195b8fa06..11545d9870 100644 --- a/.github/workflows/LINUX_BUILD_TEST.yml +++ b/.github/workflows/LINUX_BUILD_TEST.yml @@ -33,9 +33,7 @@ jobs: # Removes unecessary jobs as jobs are generated in the order seen in the matrix. # "Exclude" is to keep job ordering nice i.e. keeping ubuntu jobs next to each other in the list. ####################################### - exclude: - - OS: 'ubuntu:20.04' - COMPILER: 'gcc-7' + exclude: # need redhat 8 for gcc 7 and 8 | redhat 9 for gcc 9 and 10 - OS: 'redhat/ubi8:latest' From ad3d615897b381004c8d02423692e636176180b3 Mon Sep 17 00:00:00 2001 From: Alex Cockrean <84676155+ABenC377@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:42:42 +0000 Subject: [PATCH 5/5] Trying to get GCC7 working on Ubuntu 20 --- .github/actions/setup_gcc_ubuntu/action.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/actions/setup_gcc_ubuntu/action.yml b/.github/actions/setup_gcc_ubuntu/action.yml index ae5226d972..533a367a69 100644 --- a/.github/actions/setup_gcc_ubuntu/action.yml +++ b/.github/actions/setup_gcc_ubuntu/action.yml @@ -60,7 +60,7 @@ runs: shell: bash run: | wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ - apt-add-repository "deb https://apt.kitware.com/ubuntu/ focal main" && \ + apt-add-repository "deb https://apt.kitware.com/ubuntu/ focal main universe" && \ apt update && apt install cmake -y apt upgrade -y @@ -70,9 +70,6 @@ runs: - name: Install gcc shell: bash run: | - if [[ ${{ inputs.gcc-version == 'gcc-7' }} ]]; then - echo "deb http://archive.ubuntu.com/ubuntu focal main universe" >> "/etc/apt/sources.list" - fi apt-get -y install ${{ inputs.gcc-version }} apt-get -y install g++-$( echo ${{ inputs.gcc-version }} | cut -d '-' -f 2) apt update && apt upgrade -y