Skip to content

Commit

Permalink
Fix CI Errors (#935)
Browse files Browse the repository at this point in the history
* Fix test workflow

CI updated to change how artifacts are stored, instead now storing the folder containing the uploaded files. This broke how the baw-client was used in the test workflow.
  • Loading branch information
Allcharles authored Mar 18, 2021
1 parent 7f50d13 commit 3d0bb10
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 20 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
node_modules/
coverage/
dist/
src/assets/old-client/
baw-client/
decorate-angular-cli.js
e2e/protractor.conf.js
46 changes: 26 additions & 20 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ jobs:
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os:
- ubuntu-latest
Expand All @@ -94,7 +95,7 @@ jobs:
node-version: 12.x

- name: Copy baw-client to assets
run: cp -r baw-client/* src/assets/old-client
run: mkdir src/assets/old-client && cp -r baw-client/baw-client/* src/assets/old-client

- name: NPM install
run: npm install
Expand Down Expand Up @@ -186,32 +187,37 @@ jobs:
path: ./dist/workbench-client/
name: workbench-client

# publish_test_results:
# name: "Publish Unit Tests Results"
# needs: test
# runs-on: ubuntu-latest
# # the build-and-test job might be skipped, we don't need to run this job then
# if: success() || failure()
publish_test_results:
name: "Publish Unit Tests Results"
needs: test
runs-on: ubuntu-latest
# Do not run on dependabot requests because of https://github.com/EnricoMi/publish-unit-test-result-action/issues/95
if: >
always() &&
github.event_name == 'pull_request' &&
(! startsWith(github.ref, 'refs/heads/dependabot/'))
# steps:
# - name: Download Artifacts
# uses: actions/download-artifact@v2
# with:
# path: artifacts
# - name: Publish Unit Test Results
# uses: EnricoMi/[email protected]
# with:
# github_token: ${{ secrets.GITHUB_TOKEN }}
# files: artifacts/**/TESTS-*.xml
# report_individual_runs: true
# deduplicate_classes_by_file_name: true
steps:
- name: Download Artifacts
uses: actions/download-artifact@v2
with:
path: artifacts
- name: Publish Unit Test Results
uses: EnricoMi/[email protected]
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
files: artifacts/**/TESTS-*.xml
report_individual_runs: true
deduplicate_classes_by_file_name: true

publish:
name: "Publish Docker Container"
runs-on: "ubuntu-latest"
needs: ["test", "build"]
# only on tag or commit to master
if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || contains(github.ref, 'refs/tag'))
if: >
github.event_name == 'push' &&
(github.ref == 'refs/heads/master' || contains(github.ref, 'refs/tag'))
steps:
- uses: actions/checkout@v2
- name: Build and push Docker image
Expand Down

0 comments on commit 3d0bb10

Please sign in to comment.