Skip to content

Commit 836ab35

Browse files
Merge branch 'main' into feature/#233-add-nox-task-to-verify-dependency-declarations
2 parents 2a11ca0 + fc35075 commit 836ab35

File tree

5 files changed

+27
-19
lines changed

5 files changed

+27
-19
lines changed

.github/workflows/checks.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ jobs:
6262
run: poetry run nox -s lint
6363

6464
- name: Upload Artifacts
65-
uses: actions/upload-artifact@v3
65+
uses: actions/upload-artifact@v4.4.0
6666
with:
67-
name: .lint.txt
67+
name: lint-python${{ matrix.python-version }}
6868
path: .lint.txt
69-
overwrite: true
69+
include-hidden-files: true
7070

7171
type-check-job:
7272
name: Type Checking (Python-${{ matrix.python-version }})
@@ -114,7 +114,8 @@ jobs:
114114
run: poetry run nox -s coverage -- -- --db-version ${{ matrix.exasol-version }}
115115

116116
- name: Upload Artifacts
117-
uses: actions/upload-artifact@v3
117+
uses: actions/upload-artifact@v4.4.0
118118
with:
119-
name: .coverage
119+
name: coverage-python${{ matrix.python-version }}
120120
path: .coverage
121+
include-hidden-files: true

.github/workflows/report.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@ jobs:
2424
uses: ./.github/actions/python-environment
2525

2626
- name: Download Artifacts
27-
uses: actions/download-artifact@v3
27+
uses: actions/download-artifact@v4.1.8
2828
with:
2929
path: ./artifacts
3030

3131
- name: Copy Artifacts into Root Folder
3232
working-directory: ./artifacts
3333
run: |
34-
cp .coverage/.coverage ../
35-
cp .lint.txt/.lint.txt ../
34+
cp coverage-python3.9/.coverage ../
35+
cp lint-python3.9/.lint.txt ../
3636
3737
- name: Generate Report
3838
run: poetry run nox -s report -- -- --format json | tee metrics.json
3939

4040
- name: Upload Artifacts
41-
uses: actions/upload-artifact@v3
41+
uses: actions/upload-artifact@v4.4.0
4242
with:
4343
name: metrics.json
4444
path: metrics.json

doc/changes/unreleased.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
## 🐞 Bug Fixes
1313

14+
* #181 Updated metrics related workflows
1415
* Fixed coverage for empty project
1516

1617
## ⚒️ Refactorings

exasol/toolbox/templates/github/workflows/checks.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Checks
22

3-
on: workflow_call
3+
on:
4+
workflow_call:
5+
secrets:
6+
ALTERNATIVE_GITHUB_TOKEN:
7+
required: false
48

59
jobs:
610

@@ -58,11 +62,11 @@ jobs:
5862
run: poetry run nox -s lint
5963

6064
- name: Upload Artifacts
61-
uses: actions/upload-artifact@v3
65+
uses: actions/upload-artifact@v4.4.0
6266
with:
63-
name: .lint.txt
67+
name: lint-python${{ matrix.python-version }}
6468
path: .lint.txt
65-
overwrite: true
69+
include-hidden-files: true
6670

6771
type-check-job:
6872
name: Type Checking (Python-${{ matrix.python-version }})
@@ -89,6 +93,8 @@ jobs:
8993
name: Tests (Python-${{ matrix.python-version }}, Exasol-${{ matrix.exasol-version}})
9094
needs: [build-documentation-job, lint-job, type-check-job]
9195
runs-on: ubuntu-latest
96+
env:
97+
GITHUB_TOKEN: ${{ secrets.ALTERNATIVE_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
9298
strategy:
9399
fail-fast: false
94100
matrix:
@@ -108,9 +114,9 @@ jobs:
108114
run: poetry run nox -s coverage -- -- --db-version ${{ matrix.exasol-version }}
109115

110116
- name: Upload Artifacts
111-
uses: actions/upload-artifact@v3
117+
uses: actions/upload-artifact@v4.4.0
112118
with:
113-
name: .coverage
119+
name: coverage-python${{ matrix.python-version }}
114120
path: .coverage
115-
overwrite: true
121+
include-hidden-files: true
116122

exasol/toolbox/templates/github/workflows/report.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ jobs:
2424
uses: exasol/python-toolbox/.github/actions/[email protected]
2525

2626
- name: Download Artifacts
27-
uses: actions/download-artifact@v3
27+
uses: actions/download-artifact@v4.1.8
2828
with:
2929
path: ./artifacts
3030

3131
- name: Copy Artifacts into Root Folder
3232
working-directory: ./artifacts
3333
run: |
34-
cp .coverage/.coverage ../
35-
cp .lint.txt/.lint.txt ../
34+
cp coverage-python3.9/.coverage ../
35+
cp lint-python3.9/.lint.txt ../
3636
3737
- name: Generate Report
3838
run: poetry run nox -s report -- -- --format json | tee metrics.json

0 commit comments

Comments
 (0)