Skip to content

Commit 828d7c9

Browse files
author
Herbert D Ludowieg
authored
Merge pull request #280 from herbertludowieg/master
Fixing build issues with version lock
2 parents 68c3b3c + 7d1e2ac commit 828d7c9

3 files changed

Lines changed: 24 additions & 4 deletions

File tree

.github/workflows/branch.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Branch
33
on:
44
push:
55
branches-ignore:
6-
- [master, main]
6+
[master, main]
77

88
concurrency:
99
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -48,6 +48,10 @@ jobs:
4848
with:
4949
path: ${{ env.pythonLocation }}
5050
key: ${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements.dev.txt') }}
51+
- name: Use Node.js version 16
52+
uses: actions/setup-node@v3
53+
with:
54+
node-version: "16.19.1"
5155
- name: Install Dependencies
5256
run: |
5357
pip install --upgrade --upgrade-strategy eager -r requirements.txt -r requirements.dev.txt -e .
@@ -71,3 +75,4 @@ jobs:
7175
with:
7276
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
7377
coverage-reports: coverage.xml
78+

.github/workflows/master.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ jobs:
3939
with:
4040
path: ${{ env.pythonLocation }}
4141
key: ${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements.dev.txt') }}
42+
- name: Use Node.js version 16
43+
uses: actions/setup-node@v3
44+
with:
45+
node-version: "16.19.1"
4246
- name: Install Dependencies
4347
run: |
4448
pip install --upgrade --upgrade-strategy eager -r requirements.txt -r requirements.dev.txt -e .
@@ -70,8 +74,15 @@ jobs:
7074
run: |
7175
rm -rf docs/source/*.txt
7276
SPHINX_APIDOC_OPTIONS=members,undoc-members,show-inheritance sphinx-apidoc -eM -s txt -o docs/source/ exatomic *test*
73-
travis-sphinx build
74-
travis-sphinx deploy
77+
sphinx-build docs/source _build
78+
- name: Deploy
79+
uses: peaceiris/actions-gh-pages@v3
80+
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
81+
with:
82+
publish_branch: gh-pages
83+
github_token: ${{ secrets.GITHUB_TOKEN }}
84+
publish_dir: _build/
85+
force_orphan: true
7586

7687
# keep github release and pypi upload together
7788
publish-release:

.github/workflows/pull-request.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Branch
1+
name: Pull Request
22

33
on:
44
pull_request:
@@ -46,6 +46,10 @@ jobs:
4646
with:
4747
path: ${{ env.pythonLocation }}
4848
key: ${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements.dev.txt') }}
49+
- name: Use Node.js version 16
50+
uses: actions/setup-node@v3
51+
with:
52+
node-version: "16.19.1"
4953
- name: Install Dependencies
5054
run: |
5155
pip install --upgrade --upgrade-strategy eager -r requirements.txt -r requirements.dev.txt -e .

0 commit comments

Comments
 (0)