From 560beb098efdd5b13f02692317fa5460c9b81141 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Fri, 23 Oct 2020 18:54:34 -0700 Subject: csh: don't require SPACK_ROOT for sourcing setup-env.csh (#18225) Don't require SPACK_ROOT for sourcing setup-env.csh and make output more consistent --- .github/workflows/linux_unit_tests.yaml | 13 +++++++++---- .github/workflows/macos_unit_tests.yaml | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to '.github') diff --git a/.github/workflows/linux_unit_tests.yaml b/.github/workflows/linux_unit_tests.yaml index 181bca36a1..5bd13c3390 100644 --- a/.github/workflows/linux_unit_tests.yaml +++ b/.github/workflows/linux_unit_tests.yaml @@ -26,9 +26,12 @@ jobs: - name: Install System packages run: | sudo apt-get -y update - sudo apt-get install -y coreutils gfortran graphviz gnupg2 mercurial ninja-build patchelf + # Needed for unit tests + sudo apt-get install -y coreutils gfortran graphviz gnupg2 mercurial + sudo apt-get install -y ninja-build patchelf # Needed for kcov - sudo apt-get -y install cmake binutils-dev libcurl4-openssl-dev zlib1g-dev libdw-dev libiberty-dev + sudo apt-get -y install cmake binutils-dev libcurl4-openssl-dev + sudo apt-get -y install zlib1g-dev libdw-dev libiberty-dev - name: Install Python packages run: | pip install --upgrade pip six setuptools codecov coverage @@ -69,9 +72,11 @@ jobs: - name: Install System packages run: | sudo apt-get -y update - sudo apt-get install -y coreutils gfortran gnupg2 mercurial ninja-build patchelf zsh fish + # Needed for shell tests + sudo apt-get install -y coreutils csh zsh tcsh fish dash bash # Needed for kcov - sudo apt-get -y install cmake binutils-dev libcurl4-openssl-dev zlib1g-dev libdw-dev libiberty-dev + sudo apt-get -y install cmake binutils-dev libcurl4-openssl-dev + sudo apt-get -y install zlib1g-dev libdw-dev libiberty-dev - name: Install Python packages run: | pip install --upgrade pip six setuptools codecov coverage diff --git a/.github/workflows/macos_unit_tests.yaml b/.github/workflows/macos_unit_tests.yaml index b8a9f6617c..d8e5e631b6 100644 --- a/.github/workflows/macos_unit_tests.yaml +++ b/.github/workflows/macos_unit_tests.yaml @@ -26,7 +26,7 @@ jobs: pip install --upgrade flake8 pep8-naming - name: Setup Homebrew packages run: | - brew install gcc gnupg2 dash kcov + brew install dash fish gcc gnupg2 kcov - name: Run unit tests run: | git --version -- cgit v1.2.3-60-g2f50