From 0d556853589fb41e15e1c24ffbe1cef434312f66 Mon Sep 17 00:00:00 2001 From: Justin Laughlin Date: Tue, 6 Aug 2024 13:52:44 -0700 Subject: [PATCH 1/4] add condition to skip if label='skip-ci' --- .github/workflows/build-and-test-dispatch.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-test-dispatch.yml b/.github/workflows/build-and-test-dispatch.yml index 57e88839..67669adb 100644 --- a/.github/workflows/build-and-test-dispatch.yml +++ b/.github/workflows/build-and-test-dispatch.yml @@ -26,7 +26,7 @@ jobs: # Build and test whole matrix of options on linux # ------------------------------------------------------------------------------------------------- test-linux-serial: - if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' }} + if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' }} strategy: fail-fast: false matrix: @@ -42,7 +42,7 @@ jobs: parallel: ${{ matrix.parallel }} test-linux-parallel: - if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' }} + if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' }} strategy: fail-fast: false matrix: @@ -79,7 +79,7 @@ jobs: # Specific cases (we want these to use defaults, and not expand the dimensions of the matrix) # ------------------------------------------------------------------------------------------------- test-macos: - if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' }} + if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' }} strategy: fail-fast: false matrix: @@ -91,21 +91,21 @@ jobs: mfem-branch: ${{ matrix.mfem-branch }} test-cuda: - if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' || inputs.test_options == 'cuda'}} + if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' || inputs.test_options == 'cuda'}} uses: ./.github/workflows/build-and-test-callable.yml with: cuda: true name: test-cuda test-libceed: - if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' || inputs.test_options == 'libceed'}} + if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' || inputs.test_options == 'libceed'}} uses: ./.github/workflows/build-and-test-callable.yml with: libceed: true name: test-libceed test-gslib: - if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' || inputs.test_options == 'gslib'}} + if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' || inputs.test_options == 'gslib'}} uses: ./.github/workflows/build-and-test-callable.yml with: gslib: true From 2186cd9fa2adacb03da938ef6107d5e5405f4b4c Mon Sep 17 00:00:00 2001 From: Justin Laughlin Date: Tue, 6 Aug 2024 14:06:40 -0700 Subject: [PATCH 2/4] whitespace --- .github/workflows/build-and-test-dispatch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test-dispatch.yml b/.github/workflows/build-and-test-dispatch.yml index 67669adb..87b50b80 100644 --- a/.github/workflows/build-and-test-dispatch.yml +++ b/.github/workflows/build-and-test-dispatch.yml @@ -40,7 +40,7 @@ jobs: mfem-branch: ${{ matrix.mfem-branch }} python-version: ${{ matrix.python-version }} parallel: ${{ matrix.parallel }} - + test-linux-parallel: if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' }} strategy: @@ -56,7 +56,7 @@ jobs: mfem-branch: ${{ matrix.mfem-branch }} python-version: ${{ matrix.python-version }} parallel: ${{ matrix.parallel }} - + # ------------------------------------------------------------------------------------------------- # Fast test # ------------------------------------------------------------------------------------------------- From 61096d06c8af1e6126a3e553411ffcc366e10e75 Mon Sep 17 00:00:00 2001 From: Justin Laughlin Date: Tue, 6 Aug 2024 14:58:09 -0700 Subject: [PATCH 3/4] cleanup --- .vscode/settings.json | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 7a73a41b..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} \ No newline at end of file From e3708ce781af8d218e92f103795162bd8baf0f31 Mon Sep 17 00:00:00 2001 From: Justin Laughlin Date: Tue, 6 Aug 2024 15:05:24 -0700 Subject: [PATCH 4/4] cleanup unused cuda scripts --- ci_scripts/add_cuda_10_1.sh | 19 ------------------- ci_scripts/add_cuda_11_1.sh | 11 ----------- ci_scripts/add_cuda_11_5.sh | 9 --------- 3 files changed, 39 deletions(-) delete mode 100755 ci_scripts/add_cuda_10_1.sh delete mode 100755 ci_scripts/add_cuda_11_1.sh delete mode 100644 ci_scripts/add_cuda_11_5.sh diff --git a/ci_scripts/add_cuda_10_1.sh b/ci_scripts/add_cuda_10_1.sh deleted file mode 100755 index fbc8da44..00000000 --- a/ci_scripts/add_cuda_10_1.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -set -ev - -UBUNTU_VERSION=$(lsb_release -sr) -UBUNTU_VERSION=ubuntu"${UBUNTU_VERSION//.}" -CUDA=10.1.105-1 -CUDA_SHORT=10.1 - -INSTALLER=cuda-repo-${UBUNTU_VERSION}_${CUDA}_amd64.deb -wget http://developer.download.nvidia.com/compute/cuda/repos/${UBUNTU_VERSION}/x86_64/${INSTALLER} -sudo dpkg -i ${INSTALLER} -wget https://developer.download.nvidia.com/compute/cuda/repos/${UBUNTU_VERSION}/x86_64/7fa2af80.pub -sudo apt-key add 7fa2af80.pub -sudo apt update -qq -sudo apt install -y cuda-core-${CUDA_SHORT/./-} cuda-cudart-dev-${CUDA_SHORT/./-} cuda-cufft-dev-${CUDA_SHORT/./-} -sudo apt clean - - - diff --git a/ci_scripts/add_cuda_11_1.sh b/ci_scripts/add_cuda_11_1.sh deleted file mode 100755 index c004d6dc..00000000 --- a/ci_scripts/add_cuda_11_1.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -ev - -wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin -sudo mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 -wget https://developer.download.nvidia.com/compute/cuda/11.1.1/local_installers/cuda-repo-ubuntu2004-11-1-local_11.1.1-455.32.00-1_amd64.deb -sudo dpkg -i cuda-repo-ubuntu2004-11-1-local_11.1.1-455.32.00-1_amd64.deb -sudo apt-key add /var/cuda-repo-ubuntu2004-11-1-local/7fa2af80.pub -sudo apt-get update -sudo apt-get -y install cuda - diff --git a/ci_scripts/add_cuda_11_5.sh b/ci_scripts/add_cuda_11_5.sh deleted file mode 100644 index 0c3c23fa..00000000 --- a/ci_scripts/add_cuda_11_5.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -ev -wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin -sudo mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 -wget https://developer.download.nvidia.com/compute/cuda/11.5.0/local_installers/cuda-repo-ubuntu2004-11-5-local_11.5.0-495.29.05-1_amd64.deb -sudo dpkg -i cuda-repo-ubuntu2004-11-5-local_11.5.0-495.29.05-1_amd64.deb -sudo apt-key add /var/cuda-repo-ubuntu2004-11-5-local/7fa2af80.pub -sudo apt-get update -sudo apt-get -y install cuda