Skip to content

Commit

Permalink
Merge pull request #75 from GENESIS-EFRC/matt-tests
Browse files Browse the repository at this point in the history
Fix github workflows
  • Loading branch information
mattmcdermott authored Jan 22, 2022
2 parents 3460d1c + f9fcb86 commit b30eefc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2.4.0

- uses: actions/setup-python@v1
with:
Expand Down Expand Up @@ -37,19 +37,21 @@ jobs:
shell: bash -l {0}
needs:
- deploy

steps:
- uses: actions/checkout@v2
- uses: actions/[email protected]

- uses: conda-incubator/setup-miniconda@v2
with:
miniconda-version: "latest"
python-version: 3.9
activate-environment: foo
- run: |
python -m pip install --upgrade pip
conda install -c conda-forge graph-tool
pip install -e .
pip install -r requirements.txt
pip install -r requirements-optional.txt
pip install -r requirements-docs.txt
pip install -e .
- name: Generate changelog
uses: charmixer/auto-changelog-action@v1
Expand All @@ -61,6 +63,8 @@ jobs:
run: |
git config --local user.email "[email protected]"
git config --local user.name "GENESIS-EFRC"
git stash
git pull origin main
mv CHANGELOG.md docs/
git add docs/CHANGELOG.md && git commit -m 'Updated CHANGELOG.md'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2.4.0
- uses: conda-incubator/setup-miniconda@v2
with:
miniconda-version: "latest"
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2.4.0
- uses: conda-incubator/setup-miniconda@v2
with:
miniconda-version: "latest"
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2.4.0
- uses: conda-incubator/setup-miniconda@v2
with:
miniconda-version: "latest"
Expand Down

0 comments on commit b30eefc

Please sign in to comment.