Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cache and release new docs on releases only #99

Merged
merged 2 commits into from
Aug 3, 2020
Merged

Fix cache and release new docs on releases only #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d97fc5
Fix cache
anders-kiaer Aug 3, 2020
246c2be
Update README
anders-kiaer Aug 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/flownet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
9 changes: 4 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,14 @@ 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).
anders-kiaer marked this conversation as resolved.
Show resolved Hide resolved
For convenience, a pre-simulated case is included in the FlowNet test dataset.

```bash
cd
git clone https://github.com/OPM/opm-data.git
tar -zxvf tests/data/norne.tar.gz -C tests/data/
```

### Running FlowNet
Expand Down
10 changes: 0 additions & 10 deletions build_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down