Skip to content

Commit 85ad1f2

Browse files
[CONFIG] More refactoring for CI/CD (- WIP #338 -)
Changes in file .github/actions/checkout-and-rebuild/action.yml: * handle windows pip upgrade workaround Changes in file .github/workflows/Tests.yml: * use trigger artifact info * refactor for template actions a little * expand envs with trigger artifact info
1 parent 0bb6794 commit 85ad1f2

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

.github/actions/checkout-and-rebuild/action.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ runs:
8888
python-version: ${{ inputs.python-version }}
8989
cache: 'pip' # caching pip dependencies
9090
if: ${{ !cancelled() }}
91+
- run: python -m pip install --upgrade pip
92+
shell: bash
93+
if: ${{ !cancelled() && runner.os == 'Windows' }}
9194
- name: "Install Test Dependencies"
9295
shell: bash
9396
run: |

.github/workflows/Tests.yml

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ jobs:
117117
COV_CORE_SOURCE: ./
118118
COV_CORE_CONFIG: ./.coveragerc
119119
COV_CORE_DATAFILE: ./coverage.xml
120+
CI_BRANCH: ${{ needs.check_mats.outputs.mats_ref_name }}
121+
CI_COMMIT_SHA: ${{ needs.check_mats.outputs.mats_sha }}
122+
BRANCH_NAME: ${{ needs.check_mats.outputs.mats_ref_name }}
123+
VCS_BRANCH_NAME: ${{ needs.check_mats.outputs.build_ref_name }}
124+
VCS_COMMIT_ID: ${{ needs.check_mats.outputs.build_sha }}
120125
steps:
121126
- name: pre-checkout repository for actions
122127
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -132,10 +137,6 @@ jobs:
132137
build-run-id: ${{ needs.check_mats.outputs.build_id }}
133138
python-version: ${{ matrix.python-version }}
134139
path: ${{ github.workspace }}
135-
- name: Fix braindead windows ${{ matrix.python-version }} on ${{ matrix.os }}
136-
uses: ./.github/actions/upgrade-windows-pip
137-
- name: Install dependencies for python ${{ matrix.python-version }} on ${{ matrix.os }}
138-
run: make -f Makefile test-reqs || true
139140
- name: Install code-climate tools for ${{ matrix.python-version }} on ${{ matrix.os }}
140141
if: ${{ !cancelled() && runner.os == 'Linux' }}
141142
shell: bash
@@ -159,7 +160,7 @@ jobs:
159160
- name: Generate Test Coverage for py${{ matrix.python-version }} on ${{ matrix.os }}
160161
env:
161162
TESTS_USE_PYTEST: 1
162-
run: make -f Makefile test >> "$GITHUB_STEP_SUMMARY" ;
163+
run: make -f Makefile test || exit 1 ;
163164
- name: Upload Python ${{ matrix.python-version }} test coverage to Codecov
164165
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
165166
with:
@@ -252,10 +253,6 @@ jobs:
252253
build-run-id: ${{ needs.check_mats.outputs.build_id }}
253254
python-version: ${{ matrix.python-version }}
254255
path: ${{ github.workspace }}
255-
- name: Fix braindead windows ${{ matrix.python-version }} on ${{ matrix.os }}
256-
uses: ./.github/actions/upgrade-windows-pip
257-
- name: Install dependencies for python ${{ matrix.python-version }} on ${{ matrix.os }}
258-
run: make -f Makefile test-reqs || true ;
259256
- name: Install code-climate tools for ${{ matrix.python-version }} on ${{ matrix.os }}
260257
if: ${{ !cancelled() && runner.os == 'Linux' }}
261258
shell: bash
@@ -273,9 +270,6 @@ jobs:
273270
DEEPSOURCE_DSN: ${{ secrets.DEEPSOURCE_DSN }}
274271
run: |
275272
(curl https://deepsource.io/cli | sh) || true ;
276-
- name: Pre-Clean
277-
id: clean
278-
run: make -j1 -f Makefile clean || true ;
279273
- name: Generate Doctest Coverage for py${{ matrix.python-version }} on ${{ matrix.os }}
280274
run: make -f Makefile test-mat-doctests ;
281275
- name: Upload Python ${{ matrix.python-version }} doctest coverage to Codecov
@@ -315,7 +309,7 @@ jobs:
315309
- name: Post-Clean
316310
id: post
317311
run: make -j1 -f Makefile clean || true ;
318-
if: ${{ always() }}
312+
if: ${{ success() }}
319313

320314

321315
STYLE:
@@ -333,7 +327,7 @@ jobs:
333327
defaults:
334328
run:
335329
shell: bash
336-
timeout-minutes: 10
330+
timeout-minutes: 2
337331

338332
env:
339333
PYTHON_VERSION: "${{ vars.PYTHON_DEFAULT }}"
@@ -399,6 +393,11 @@ jobs:
399393
COV_CORE_SOURCE: ./
400394
COV_CORE_CONFIG: ./.coveragerc
401395
COV_CORE_DATAFILE: .coverage
396+
CI_BRANCH: ${{ needs.check_mats.outputs.mats_ref_name }}
397+
CI_COMMIT_SHA: ${{ needs.check_mats.outputs.mats_sha }}
398+
BRANCH_NAME: ${{ needs.check_mats.outputs.mats_ref_name }}
399+
VCS_BRANCH_NAME: ${{ needs.check_mats.outputs.build_ref_name }}
400+
VCS_COMMIT_ID: ${{ needs.check_mats.outputs.build_sha }}
402401
CODECLIMATE_REPO_TOKEN: ${{ secrets.CODECLIMATE_TOKEN }}
403402
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
404403
steps:
@@ -464,7 +463,7 @@ jobs:
464463
override_commit: ${{ needs.check_mats.outputs.build_sha }}
465464
files: ./test-reports/coverage_supplement.xml,./test-reports/coverage_doctests.xml,./test-reports/coverage.xml
466465
directory: .
467-
env_vars: OS,PYTHON_VERSION
466+
env_vars: OS,PYTHON_VERSION,CI_COMMIT_SHA
468467
flags: multicast
469468
name: multicast-github-${{ matrix.os }}-${{ matrix.python-version }}
470469
verbose: true
@@ -533,6 +532,11 @@ jobs:
533532
COV_CORE_SOURCE: ./
534533
COV_CORE_CONFIG: ./.coveragerc
535534
COV_CORE_DATAFILE: .coverage
535+
CI_BRANCH: ${{ needs.check_mats.outputs.mats_ref_name }}
536+
CI_COMMIT_SHA: ${{ needs.check_mats.outputs.mats_sha }}
537+
BRANCH_NAME: ${{ needs.check_mats.outputs.mats_ref_name }}
538+
VCS_BRANCH_NAME: ${{ needs.check_mats.outputs.build_ref_name }}
539+
VCS_COMMIT_ID: ${{ needs.check_mats.outputs.build_sha }}
536540
CODECLIMATE_REPO_TOKEN: ${{ secrets.CODECLIMATE_TOKEN }}
537541
steps:
538542
- name: pre-checkout repository for actions
@@ -549,12 +553,6 @@ jobs:
549553
build-run-id: ${{ needs.check_mats.outputs.build_id }}
550554
python-version: ${{ matrix.python-version }}
551555
path: ${{ github.workspace }}
552-
- name: Pre-Clean
553-
id: clean-prep
554-
run: make -j1 -f Makefile clean ;
555-
- name: Pre-build for Python ${{ matrix.python-version }} on ${{ matrix.os }}
556-
run: make -j1 -f Makefile build ;
557-
if: ${{ success() }}
558556
- name: Pre-install for Python ${{ matrix.python-version }} on ${{ matrix.os }}
559557
run: make -j1 -f Makefile user-install || true ;
560558
if: ${{ success() }}

0 commit comments

Comments
 (0)