Skip to content

Commit f440d69

Browse files
authored
Merge pull request #32 from Paebbels/paebbels/pipeline-updates
Dependency updates
2 parents 0c19d16 + b913bac commit f440d69

File tree

2 files changed

+32
-65
lines changed

2 files changed

+32
-65
lines changed

.github/workflows/Pipeline.yml

Lines changed: 17 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
Prepare:
12-
uses: pyTooling/Actions/.github/workflows/PrepareJob.yml@r6
12+
uses: pyTooling/Actions/.github/workflows/PrepareJob.yml@r7
1313
with:
1414
release_tag_pattern: '2\d{3}\.\d{2}[a-z]?'
1515

@@ -35,7 +35,7 @@ jobs:
3535

3636
steps:
3737
- name: ⏬ Checkout repository
38-
uses: actions/checkout@v5
38+
uses: actions/checkout@v6
3939
with:
4040
submodules: recursive
4141

@@ -133,7 +133,7 @@ jobs:
133133

134134
steps:
135135
- name: ⏬ Checkout repository
136-
uses: actions/checkout@v5
136+
uses: actions/checkout@v6
137137
with:
138138
submodules: recursive
139139

@@ -213,76 +213,28 @@ jobs:
213213
if-no-files-found: error
214214
retention-days: 1
215215

216-
# The following job is based on pyTooling/PublishTestResults, but specialized for OSVVM's needs.
217-
# * Changed to another JUnit dialect (pyTest-JUnit -> Any-JUnit)
218216
PublishTestResults:
219-
name: 📊 Publish Tests Results
220-
runs-on: ubuntu-24.04
217+
uses: pyTooling/Actions/.github/workflows/PublishTestResults.yml@r7
221218
needs:
222219
- GHDL
223220
- NVC
224-
225-
if: always()
226-
227-
steps:
228-
- name: ⏬ Checkout repository
229-
uses: actions/checkout@v5
230-
231-
- name: '📥 Download artifact: package'
232-
uses: actions/download-artifact@v5
233-
with:
234-
pattern: xml-*
235-
path: artifacts
236-
237-
- name: 🔎 Inspect all artifacts
238-
run: |
239-
tree artifacts
240-
241-
- name: 🔧 Install pyEDAA.Reports (JUnit Parser and Merger)
242-
run: |
243-
python -m pip install --disable-pip-version-check --break-system-packages -U pyEDAA.Reports
244-
245-
- name: Rename JUnit files and move them all into 'junit/'
246-
run: |
247-
mkdir -p junit
248-
find artifacts/ -type f -path "*.xml" -exec sh -c 'cp -v $0 "junit/$(basename $(dirname $0)).$(basename $0)"' {} ';'
249-
tree -pash junit
250-
251-
- name: 🔁 Merge JUnit Unit Test Summaries
252-
run: |
253-
pyedaa-reports -d unittest \
254-
"--merge=Any-JUnit:junit/*.xml" \
255-
--render=tree \
256-
"--name=OSVVM Regression" \
257-
"--output=pyTest-JUnit:Unittesting.xml"
258-
printf "%s\n" "cat Unittesting.xml"
259-
cat Unittesting.xml
260-
261-
- name: 📊 Publish Unit Test Results
262-
uses: dorny/test-reporter@v2
263-
if: ${{ github.event_name != 'pull_request' }}
264-
with:
265-
name: OSVVM VC Regression Results
266-
path: Unittesting.xml
267-
reporter: java-junit
268-
# list-suites: all
269-
# list-tests: failed
270-
271-
- name: 📤 Upload merged 'JUnit Test Summary' artifact
272-
uses: pyTooling/upload-artifact@v4
273-
with:
274-
name: xml
275-
path: Unittesting.xml
276-
if-no-files-found: error
277-
retention-days: 1
221+
if: success() || failure()
222+
with:
223+
unittest_artifacts_pattern: 'xml-*'
224+
testsuite-summary-name: 'OSVVM Regression'
225+
merge-input-dialect: 'Any-JUnit'
226+
merge-output-dialect: 'pyTest-JUnit'
227+
additional_merge_args: '--render=tree'
228+
merged_junit_artifact: 'xml'
229+
dorny: 'true'
278230

279231
Package:
280232
name: 📦 Package OSVVMLibraries incl. all Git submodules as artifact
281233
runs-on: ubuntu-24.04
282234

283235
steps:
284236
- name: ⏬ Checkout repository
285-
uses: actions/checkout@v5
237+
uses: actions/checkout@v6
286238
with:
287239
path: OsvvmLibraries
288240
submodules: recursive
@@ -296,7 +248,7 @@ jobs:
296248
tree OsvvmLibraries
297249
298250
- name: '📤 Upload artifact: osvvm'
299-
uses: pyTooling/upload-artifact@v4
251+
uses: pyTooling/upload-artifact@v6
300252
with:
301253
name: osvvm
302254
working-directory: OsvvmLibraries
@@ -308,7 +260,7 @@ jobs:
308260
retention-days: 1
309261

310262
TriggerTaggedRelease:
311-
uses: pyTooling/Actions/.github/workflows/TagReleaseCommit.yml@r6
263+
uses: pyTooling/Actions/.github/workflows/TagReleaseCommit.yml@r7
312264
needs:
313265
- Prepare
314266
- Package
@@ -324,7 +276,7 @@ jobs:
324276
secrets: inherit
325277

326278
Release:
327-
uses: pyTooling/Actions/.github/workflows/PublishReleaseNotes.yml@r6
279+
uses: pyTooling/Actions/.github/workflows/PublishReleaseNotes.yml@r7
328280
needs:
329281
- Prepare
330282
- Package

.github/workflows/dependabot.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
version: 2
2+
updates:
3+
# Maintain GitHub Action runners
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
target-branch: dev
7+
commit-message:
8+
prefix: "[Dependabot]"
9+
labels:
10+
- Dependencies
11+
assignees:
12+
- JimLewis
13+
- Paebbels
14+
schedule:
15+
interval: "daily" # Checks on Monday trough Friday.

0 commit comments

Comments
 (0)