From 33dbc2b7b11681f7e911cb619511b0d00d7da8c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Sat, 25 Jan 2020 10:33:27 -0700 Subject: Install cmake using apt-get --- .github/workflows/CI.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to '.github') diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c9618f5..3264513 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -36,15 +36,12 @@ jobs: with: python-version: 3.x - - name: Set up common - run: pip install --upgrade cmake - - - name: Install GFortran Linux + - name: Install GFortran and CMake Linux if: contains(matrix.os, 'ubuntu') run: | sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update - sudo apt-get install -y gcc-${GCC_V} gfortran-${GCC_V} + sudo apt-get install -y gcc-${GCC_V} gfortran-${GCC_V} cmake sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \ --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \ --slave /usr/bingcov gcov /usr/bin/gcov-${GCC_V} -- cgit v1.2.3 From 5cfa1e7e9060fcb20db4037d87fe4fb4b8a788f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Sat, 25 Jan 2020 10:35:49 -0700 Subject: Do not install Python --- .github/workflows/CI.yml | 5 ----- 1 file changed, 5 deletions(-) (limited to '.github') diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3264513..8ac6435 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -31,11 +31,6 @@ jobs: - name: Checkout code uses: actions/checkout@v1 - - name: Set up Python 3.x - uses: actions/setup-python@v1 # Use pip to install latest CMake, & FORD/Jin2For, etc. - with: - python-version: 3.x - - name: Install GFortran and CMake Linux if: contains(matrix.os, 'ubuntu') run: | -- cgit v1.2.3 From 210ffbf4e07b63d7d13c4be4d9e3f547cc609b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Sat, 25 Jan 2020 10:39:14 -0700 Subject: Install cmake using a binary --- .github/workflows/CI.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8ac6435..2f351a1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -31,12 +31,16 @@ jobs: - name: Checkout code uses: actions/checkout@v1 - - name: Install GFortran and CMake Linux + - name: Install CMake Linux + if: contains(matrix.os, 'ubuntu') + run: ci/install_cmake.sh + + - name: Install GFortran Linux if: contains(matrix.os, 'ubuntu') run: | sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update - sudo apt-get install -y gcc-${GCC_V} gfortran-${GCC_V} cmake + sudo apt-get install -y gcc-${GCC_V} gfortran-${GCC_V} sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \ --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \ --slave /usr/bingcov gcov /usr/bin/gcov-${GCC_V} -- cgit v1.2.3