Skip to content

Commit

Permalink
Merge pull request #771 from steve-dill/dev-fix-unit-test-action
Browse files Browse the repository at this point in the history
upgrade artifact upload plugin version
  • Loading branch information
GregJohnStewart authored Jan 30, 2025
2 parents 32aac0a + 925373c commit e8b43c8
Show file tree
Hide file tree
Showing 16 changed files with 53 additions and 43 deletions.
1 change: 0 additions & 1 deletion .github/workflows/core-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@ jobs:
with:
path: "software/oqm-core-api"
containerBased: ${{ matrix.containerBased }}

9 changes: 5 additions & 4 deletions .github/workflows/coreLib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,22 @@ jobs:
arguments: javadoc jar javadocJar sourcesJar
build-root-directory: "software/libs/open-qm-core"
- name: Archive code coverage results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Code Coverage Report
path: "software/libs/open-qm-core/build/reports/jacoco/test/html"
- name: Archive Junit Test Report
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Junit Test Report
path: "software/libs/open-qm-core/build/reports/tests/test"
- name: Archive Javadocs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Javadocs
path: "software/libs/open-qm-core/build/docs/javadoc"
- name: Archive libs (Jars)
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Libs (Jars)
path: "software/libs/open-qm-core/build/libs/*"
Expand Down Expand Up @@ -89,3 +89,4 @@ jobs:
with:
github_token: "${{ secrets.GITHUB_TOKEN }}"
files: "software/libs/open-qm-core/build/test-results/**/*.xml"

1 change: 1 addition & 0 deletions .github/workflows/deployMainRepos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,4 @@ jobs:
});
}
1 change: 1 addition & 0 deletions .github/workflows/deployTestRepos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,4 @@ jobs:
});
}
9 changes: 5 additions & 4 deletions .github/workflows/driverLib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,22 @@ jobs:
arguments: javadoc jar javadocJar sourcesJar
build-root-directory: "software/libs/open-qm-moduleDriver"
- name: Archive code coverage results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Code Coverage Report
path: "software/libs/open-qm-moduleDriver/build/reports/jacoco/test/html"
- name: Archive Junit Test Report
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Junit Test Report
path: "software/libs/open-qm-moduleDriver/build/reports/tests/test"
- name: Archive Javadocs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Javadocs
path: "software/libs/open-qm-moduleDriver/build/docs/javadoc"
- name: Archive libs (Jars)
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Libs (Jars)
path: "software/libs/open-qm-moduleDriver/build/libs/*"
Expand All @@ -88,3 +88,4 @@ jobs:
# with:
# github_token: "${{ secrets.GITHUB_TOKEN }}"
# files: "software/libs/open-qm-core/build/test-results/**/*.xml"

9 changes: 5 additions & 4 deletions .github/workflows/driverServer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ jobs:
arguments: check
build-root-directory: "software/drivers/open-qm-driver-server"
- name: Archive code coverage results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Code Coverage Report
path: "software/drivers/open-qm-driver-server/build/jacoco-report"
- name: Archive Test Report
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Test Report
path: "software/drivers/open-qm-driver-server/build/reports/tests/test"
Expand All @@ -69,7 +69,7 @@ jobs:
path: "software/drivers/open-qm-driver-server/build/test-results/test/*.xml" # Path to test results
reporter: java-junit # Format of test results
# - name: Archive Selenium Recordings
# uses: actions/upload-artifact@v2
# uses: actions/upload-artifact@v4
# with:
# name: Selenium Recordings
# path: "software/drivers/open-qm-driver-server/build/seleniumRecordings"
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
path: "software/drivers/open-qm-driver-server/build/test-results/quarkusIntTest/*.xml" # Path to test results
reporter: java-junit # Format of test results
- name: Archive Integration Test Report
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Integration Test Report
path: "software/drivers/open-qm-driver-server/build/reports/tests/quarkusIntTest"
Expand All @@ -117,3 +117,4 @@ jobs:
# with:
# github_token: "${{ secrets.GITHUB_TOKEN }}"
# files: "software/open-qm-base-station/build/test-results/**/*.xml"

1 change: 1 addition & 0 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ jobs:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2

1 change: 1 addition & 0 deletions .github/workflows/plugin-alertMessenger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ jobs:
path: "software/plugins/alert-messenger/"
containerBased: ${{ matrix.containerBased }}


11 changes: 6 additions & 5 deletions .github/workflows/plugin-demoQuarkus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ jobs:
arguments: check
build-root-directory: "software/plugins/open-qm-plugin-demo"
- name: Archive code coverage results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Code Coverage Report
path: "software/plugins/open-qm-plugin-demo/build/jacoco-report"
- name: Archive Test Report
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Test Report
path: "software/plugins/open-qm-plugin-demo/build/reports/tests/test"
Expand All @@ -59,7 +59,7 @@ jobs:
path: "software/plugins/open-qm-plugin-demo/build/test-results/test/*.xml" # Path to test results
reporter: java-junit # Format of test results
- name: Archive Selenium Recordings
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Selenium Recordings
path: "software/plugins/open-qm-plugin-demo/build/seleniumRecordings"
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
# path: "software/open-qm-base-station/build/test-results/quarkusIntTest/*.xml" # Path to test results
# reporter: java-junit # Format of test results
# - name: Archive Integration Test Report
# uses: actions/upload-artifact@v2
# uses: actions/upload-artifact@v4
# if: success() || failure()
# with:
# name: Integration Test Report
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
# path: "software/open-qm-base-station/build/test-results/quarkusIntTest/*.xml" # Path to test results
# reporter: java-junit # Format of test results
# - name: Archive Native Integration Test Report
# uses: actions/upload-artifact@v2
# uses: actions/upload-artifact@v4
# if: success() || failure()
# with:
# name: Native Integration Test Report
Expand All @@ -144,3 +144,4 @@ jobs:
# with:
# github_token: "${{ secrets.GITHUB_TOKEN }}"
# files: "software/open-qm-base-station/build/test-results/**/*.xml"

1 change: 1 addition & 0 deletions .github/workflows/plugin-extItemSearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ jobs:
path: "software/plugins/external-item-search/"
containerBased: ${{ matrix.containerBased }}


2 changes: 1 addition & 1 deletion .github/workflows/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ To try:

TODO::

- jacoco html display
- jacoco html display
35 changes: 18 additions & 17 deletions .github/workflows/stationCaptain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@ name: CI - Manager - Station Captain

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ "**" ]
paths:
- "deployment/Single Host/Station-Captain/**"
- ".github/workflows/stationCaptain.yml"
pull_request:
branches: [ "**" ]
paths:
- "deployment/Single Host/Station-Captain/**"
- ".github/workflows/stationCaptain.yml"
workflow_call:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# # Triggers the workflow on push or pull request events but only for the main branch
# push:
# branches: [ "**" ]
# paths:
# - "deployment/Single Host/Station-Captain/**"
# - ".github/workflows/stationCaptain.yml"
# pull_request:
# branches: [ "**" ]
# paths:
# - "deployment/Single Host/Station-Captain/**"
# - ".github/workflows/stationCaptain.yml"
# workflow_call:
# # Allows you to run this workflow manually from the Actions tab
defaults:
run:
working-directory: "deployment/Single Host/Station-Captain/"
Expand Down Expand Up @@ -78,7 +79,7 @@ jobs: # This workflow contains a single job called "build"
- name: Make Installers
run: ./makeInstallers.sh
- name: Archive Installers
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Installers Produced
path: "deployment/Single Host/Station-Captain/bin"
Expand Down Expand Up @@ -112,7 +113,7 @@ jobs: # This workflow contains a single job called "build"
-
name: Archive Cucumber Reports Ubuntu
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Cucumber Test Reports Ubuntu
path: "deployment/Single Host/Station-Captain/stationCaptainTest/target/test-reports/*"
Expand Down Expand Up @@ -153,7 +154,7 @@ jobs: # This workflow contains a single job called "build"
-
name: Archive Cucumber Reports Fedora
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Cucumber Test Reports Fedora
path: "deployment/Single Host/Station-Captain/stationCaptainTest/target/test-reports/*"
Expand All @@ -164,4 +165,4 @@ jobs: # This workflow contains a single job called "build"
with:
name: Fedora Cucumber Reports
access-token: ${{ secrets.GITHUB_TOKEN }}
path: "deployment/Single Host/Station-Captain/stationCaptainTest/target/test-reports/report.json"
path: "deployment/Single Host/Station-Captain/stationCaptainTest/target/test-reports/report.json"
2 changes: 1 addition & 1 deletion .github/workflows/wf-gradleBuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ jobs:
- uses: gradle/gradle-build-action@v2
with:
arguments: build -x test
build-root-directory: ${{ inputs.path }}
build-root-directory: ${{ inputs.path }}
4 changes: 2 additions & 2 deletions .github/workflows/wf-gradleQuarkusIntTest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Archive Test Report
env:
NODE_OPTIONS: "--max_old_space_size=4096"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: success() || failure() # run this step even if previous step failed
with:
name: "Integration Test Report (Container ${{ inputs.containerBased }})"
Expand All @@ -40,4 +40,4 @@ jobs:
with:
name: "Integration Test Report (Container: ${{ inputs.containerBased }})" # Name of the check run which will be created
path: "${{ inputs.path }}/build/test-results/quarkusIntTest/*.xml" # Path to test results
reporter: java-junit # Format of test results
reporter: java-junit # Format of test results
7 changes: 4 additions & 3 deletions .github/workflows/wf-gradleUnitTest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:
arguments: test
build-root-directory: ${{ inputs.path }}
- name: Archive code coverage results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Code Coverage Report
path: "${{ inputs.path }}/build/jacoco-report"
- name: Archive Unit Test Report
env:
NODE_OPTIONS: "--max_old_space_size=4096"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Unit Test Report
path: "${{ inputs.path }}/build/reports/tests/test"
Expand All @@ -40,4 +40,5 @@ jobs:
with:
name: Unit Test Report # Name of the check run which will be created
path: "${{ inputs.path }}/build/test-results/test/*.xml" # Path to test results
reporter: java-junit # Format of test results
reporter: java-junit # Format of test results

2 changes: 1 addition & 1 deletion .github/workflows/wf-setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ jobs:
uses: actions/setup-java@v2
with:
java-version: '17'
distribution: 'adopt'
distribution: 'adopt'

0 comments on commit e8b43c8

Please sign in to comment.