Skip to content

Commit 993b4f1

Browse files
author
Ayaz Salikhov
committed
Refactor github workflows
1 parent 0919c6a commit 993b4f1

File tree

5 files changed

+54
-40
lines changed

5 files changed

+54
-40
lines changed

.github/workflows/docker.yml

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,53 @@ on:
55
# Weekly, at 03:00 on Monday UTC time
66
- cron: "0 3 * * 1"
77
pull_request:
8-
paths-ignore:
9-
- ".github/ISSUE_TEMPLATE/**"
10-
- "*.md"
11-
- "binder/**"
12-
- "docs/**"
13-
- "examples/**"
14-
- ".pre-commit-config.yaml"
15-
- ".readthedocs.yaml"
8+
paths:
9+
- ".github/workflows/docker.yml"
10+
11+
- "all-spark-notebook/"
12+
- "base-notebook/"
13+
- "datascience-notebook/"
14+
- "minimal-notebook/"
15+
- "pyspark-notebook/"
16+
- "r-notebook/"
17+
- "scipy-notebook/"
18+
- "tensorflow-notebook/"
19+
20+
- "tagging/"
21+
- "test/"
22+
- "conftest.py"
23+
- "Makefile"
24+
- "pytest.ini"
25+
- "requirements-dev.txt"
1626
push:
1727
branches:
18-
- master
1928
- main
20-
paths-ignore:
21-
- ".github/ISSUE_TEMPLATE/**"
22-
- "*.md"
23-
- "binder/**"
24-
- "docs/**"
25-
- "examples/**"
26-
- ".pre-commit-config.yaml"
27-
- ".readthedocs.yaml"
29+
- master
30+
paths:
31+
- ".github/workflows/docker.yml"
32+
33+
- "all-spark-notebook/"
34+
- "base-notebook/"
35+
- "datascience-notebook/"
36+
- "minimal-notebook/"
37+
- "pyspark-notebook/"
38+
- "r-notebook/"
39+
- "scipy-notebook/"
40+
- "tensorflow-notebook/"
41+
42+
- "tagging/"
43+
- "test/"
44+
- "conftest.py"
45+
- "Makefile"
46+
- "pytest.ini"
47+
- "requirements-dev.txt"
2848

2949
jobs:
3050
build-test-publish-images:
3151
name: Build, test, and publish Docker Images
3252
runs-on: ubuntu-latest
3353
permissions:
3454
contents: write
35-
if: >
36-
!contains(github.event.head_commit.message, 'ci skip') &&
37-
!contains(github.event.pull_request.title, 'ci skip')
3855

3956
steps:
4057
# Setup docker to build for multiple platforms, see:
@@ -84,7 +101,7 @@ jobs:
84101
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.event_name == 'schedule'
85102
uses: stefanzweifel/git-auto-commit-action@abd87b7d94702070bef78dc1d56b6928b8fa9ecc # dependabot updates to latest release
86103
with:
87-
commit_message: "[ci skip] Automated publish for ${{github.sha}}"
104+
commit_message: "Automated publish for ${{github.sha}}"
88105
repository: wiki/
89106

90107
- name: Login to Docker Hub

.github/workflows/hub-overview.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@ name: Update dockerhub overviews
33
on:
44
push:
55
branches:
6-
- master
76
- main
7+
- master
88
paths:
9+
- ".github/workflows/hub-overview.yml"
10+
11+
- "all-spark-notebook/README.md"
912
- "base-notebook/README.md"
13+
- "datascience-notebook/README.md"
1014
- "minimal-notebook/README.md"
15+
- "pyspark-notebook/README.md"
1116
- "r-notebook/README.md"
1217
- "scipy-notebook/README.md"
1318
- "tensorflow-notebook/README.md"
14-
- "datascience-notebook/README.md"
15-
- "pyspark-notebook/README.md"
16-
- "all-spark-notebook/README.md"
1719

1820
jobs:
1921
update-dockerhub-overview:
2022
name: Update dockerhub overviews
2123
runs-on: ubuntu-latest
22-
if: >
23-
!contains(github.event.head_commit.message, 'ci skip') &&
24-
!contains(github.event.pull_request.title, 'ci skip')
2524

2625
steps:
2726
- name: Clone Main Repo

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@ on:
44
pull_request:
55
push:
66
branches:
7-
- master
87
- main
8+
- master
99

1010
jobs:
1111
run-hooks:
1212
name: Run pre-commit hooks
1313
runs-on: ubuntu-latest
14-
if: >
15-
!contains(github.event.head_commit.message, 'ci skip') &&
16-
!contains(github.event.pull_request.title, 'ci skip')
1714

1815
steps:
1916
- name: Clone Main Repo

.github/workflows/sphinx.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,28 @@ name: Build Sphinx Documentation
33
on:
44
pull_request:
55
paths:
6-
- "docs/**"
76
- ".github/workflows/sphinx.yml"
7+
8+
- "docs/**"
89
- ".readthedocs.yaml"
10+
- "requirements-dev.txt"
911
push:
1012
branches:
11-
- master
1213
- main
14+
- master
1315
paths:
14-
- "docs/**"
1516
- ".github/workflows/sphinx.yml"
17+
18+
- "docs/**"
1619
- ".readthedocs.yaml"
20+
- "requirements-dev.txt"
1721

1822
jobs:
1923
build-docs:
2024
name: Build Sphinx Documentation
2125
runs-on: ubuntu-latest
2226
permissions:
2327
contents: write
24-
if: >
25-
!contains(github.event.head_commit.message , 'ci skip') &&
26-
!contains(github.event.pull_request.title, 'ci skip')
2728

2829
steps:
2930
- name: Checkout Repo
@@ -52,4 +53,4 @@ jobs:
5253
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
5354
uses: stefanzweifel/git-auto-commit-action@abd87b7d94702070bef78dc1d56b6928b8fa9ecc # dependabot updates to latest release
5455
with:
55-
commit_message: "[ci skip] Automated publish for ${{github.sha}}"
56+
commit_message: "Automated publish for ${{github.sha}}"

docs/contributing/stacks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ The cookiecutter template comes with a `.github/workflows/docker.yml` file, whic
7878
- "*.md"
7979
push:
8080
branches:
81-
- master
8281
- main
82+
- master
8383
paths-ignore:
8484
- "*.md"
8585
```

0 commit comments

Comments
 (0)