Skip to content

Commit b4662dc

Browse files
committed
Deduplicate workflows, cleaner naming
1 parent 9fff934 commit b4662dc

File tree

7 files changed

+33
-128
lines changed

7 files changed

+33
-128
lines changed

.github/workflows/base_daily.yml renamed to .github/workflows/base_tests.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Daily
1+
name: Base Tests
22

33
on:
44
push:
@@ -7,14 +7,11 @@ on:
77
pull_request:
88
workflow_call:
99
inputs:
10-
nim-branch:
11-
description: 'Nim branch'
12-
required: true
13-
type: string
14-
cpu:
15-
description: 'CPU'
16-
required: true
10+
include:
11+
description: 'Include matrix configurations'
12+
required: false
1713
type: string
14+
default: "[]"
1815
exclude:
1916
description: 'Exclude matrix configurations'
2017
required: false
@@ -26,13 +23,13 @@ concurrency:
2623
cancel-in-progress: true
2724

2825
jobs:
29-
delete-cache:
26+
delete_cache:
3027
runs-on: ubuntu-latest
3128
steps:
3229
- uses: snnaplab/delete-branch-cache-action@v1
3330

3431
test:
35-
needs: delete-cache
32+
needs: delete_cache
3633
timeout-minutes: 90
3734
strategy:
3835
fail-fast: false
@@ -54,13 +51,10 @@ jobs:
5451
builder: windows-2019
5552
cpu: amd64
5653
shell: msys2 {0}
57-
# - os: windows
58-
# builder: windows-2019
59-
# cpu: i386
60-
# shell: msys2 {0}
6154
nim-branch:
6255
- version-1-6
6356
- version-2-0
57+
include: ${{ fromJSON(inputs.include) }}
6458
exclude: ${{ fromJSON(inputs.exclude) }}
6559

6660
defaults:

.github/workflows/ci.yml

Lines changed: 0 additions & 91 deletions
This file was deleted.

.github/workflows/codecov.yml renamed to .github/workflows/coverage.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
name: Codecov
1+
name: Coverage
22

33
on:
4-
#On push to common branches, this computes the "bases stats" for PRs
4+
# On push to common branches, this computes the coverage PRs will compared against
55
push:
66
branches:
77
- master
@@ -15,7 +15,8 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
jobs:
18-
coverage:
18+
codecov:
19+
# Improvement: Split single job into run tests, generate coverage, and upload to codecov.
1920
name: Run coverage and upload to codecov
2021
runs-on: ubuntu-20.04
2122
env:

.github/workflows/daily.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,21 @@ on:
55
workflow_dispatch:
66

77
jobs:
8-
call-multi-nim-common:
8+
test_amd64:
99
name: Daily amd64
10-
uses: ./.github/workflows/base_daily.yml
10+
uses: ./.github/workflows/base_tests.yml
1111
with:
12-
nim-branch: "['version-1-6','version-2-0']"
13-
cpu: "['amd64']"
12+
exclude: "[{'platform': {'cpu': 'amd64'}}]"
1413

15-
call-multi-nim-common:
14+
test_i386:
1615
name: Daily i386
17-
uses: ./.github/workflows/base_daily.yml
16+
uses: ./.github/workflows/base_tests.yml
1817
with:
19-
nim-branch: "['version-1-6','version-2-0', 'devel']"
20-
cpu: "['i386']"
21-
exclude: "[{'platform': {'os':'macos'}}, {'platform': {'os':'windows'}}]"
18+
exclude: "[{'platform': {'cpu': 'i386'}}]"
2219

23-
call-multi-nim-common:
24-
name: Daily Nim Devel
25-
uses: ./.github/workflows/base_daily.yml
20+
test_nim_devel:
21+
name: Daily
22+
uses: ./.github/workflows/base_tests.yml
2623
with:
27-
nim-branch: "['devel']"
28-
cpu: "['amd64']"
24+
include: "[{'nim-branch': ['devel']}]"
25+
exclude: "[{'platform': {'os': 'linux', 'cpu': 'amd64'}}]"

.github/workflows/bumper.yml renamed to .github/workflows/dependencies.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
name: Dependency Bumper
1+
name: Update this project's version where it servers as a dependency
22
on:
33
push:
44
branches:
55
- master
66
workflow_dispatch:
77

88
jobs:
9-
bumpProjects:
9+
update_version:
10+
# Is this job necessary?
1011
runs-on: ubuntu-latest
11-
name: Bump version on ${{ matrix.target.repo }}:${{ matrix.target.branch }}
12+
name: Updating version on ${{ matrix.target.repo }}:${{ matrix.target.branch }}
1213
strategy:
1314
fail-fast: false
1415
matrix:
@@ -35,6 +36,7 @@ jobs:
3536
git checkout $GITHUB_SHA
3637
3738
- name: Commit this bump
39+
# Is it mandatory to create a new commit? Or does it exist as a way to communicate why the version was updated.
3840
run: |
3941
cd nbc
4042
git config --global user.email "${{ github.actor }}@users.noreply.github.com"

.github/workflows/doc.yml renamed to .github/workflows/documentation.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
name: Docgen
1+
name: Documentation generation and publishing
22
on:
33
push:
4+
branches:
5+
- master
46
workflow_dispatch:
57

68

.github/workflows/interop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name: Interoperability Testing
1+
name: Interoperability Tests
22
on:
33
pull_request:
44
push:
55
branches:
6-
- unstable
6+
- master
77
workflow_dispatch:
88

99
concurrency:

0 commit comments

Comments
 (0)