From 0d97fc5e1123a96af443f37eba6500cf37bd6d1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Fredrik=20Ki=C3=A6r?= Date: Mon, 3 Aug 2020 10:26:32 +0200 Subject: [PATCH] Fix cache --- .github/workflows/flownet.yml | 3 +-- README.md | 8 +++----- build_environment.sh | 10 ---------- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/.github/workflows/flownet.yml b/.github/workflows/flownet.yml index 3397b2439..2a096fca0 100644 --- a/.github/workflows/flownet.yml +++ b/.github/workflows/flownet.yml @@ -47,7 +47,6 @@ jobs: run: bash ./build_environment.sh $VENV_PATH /usr/bin/flow - name: 🏗️ Extract Norne Dataset - if: steps.cache-venv.outputs.cache-hit == 'true' run: tar -zxvf tests/data/norne.tar.gz -C tests/data/ - name: 📦 Install FlowNet @@ -104,7 +103,7 @@ jobs: twine upload dist/* - name: 📚 Update GitHub pages - if: github.ref == 'refs/heads/master' && matrix.python-version == '3.6' + if: github.event_name == 'release' && matrix.python-version == '3.6' run: | cp -R ./docs/_build ../_build git config --local user.email "flownet-github-action" diff --git a/README.md b/README.md index cf8219417..f0f332991 100644 --- a/README.md +++ b/README.md @@ -109,15 +109,13 @@ configuration file (`.cshrc` or `.bashrc`) to automatically source your virtual environment. > -### Install OPM-data (optional) +### OPM-data (optional) To be able to run examples that are dependent on the Norne field simulation, -you need to download the [OPM-data](https://github.com/OPM/opm-data) repository. -The preferred installation location is in the home directory, e.g. `~/opm-data`: +you need to extract the [OPM-data](https://github.com/OPM/opm-data). ```bash -cd -git clone https://github.com/OPM/opm-data.git +tar -zxvf tests/data/norne.tar.gz -C tests/data/ ``` ### Running FlowNet diff --git a/build_environment.sh b/build_environment.sh index 6eb2813f6..3bb277dbc 100644 --- a/build_environment.sh +++ b/build_environment.sh @@ -25,16 +25,6 @@ fi INSTALL_ENV=`readlink -f $1` FLOW_PATH=`readlink -f $2` -#################### -# UNPACK TEST DATA # -#################### - -tar -zxvf tests/data/norne.tar.gz -C tests/data/ - -############################ -# INSTALL apt-get PACKAGES # -############################ - if [[ ! -d "$INSTALL_ENV" ]]; then echo "Folder $INSTALL_ENV does not exist." echo "Building a virtual environment at $INSTALL_ENV"