Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/upstream/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/build.yml
  • Loading branch information
rhysdh540 committed May 19, 2024
2 parents 3e18f05 + 218eb97 commit 0ff8ad9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@ jobs:
run: ./gradlew build -x test --stacktrace
- name: :test
run: ./gradlew test --stacktrace
- name: Upload artifacts
- name: Upload binaries
uses: actions/upload-artifact@v3
with:
name: ZSON
path: "build/libs/zson-*.jar"
path: "build/libs/*.jar"
- name: Upload test results
uses: actions/upload-artifact@v3
with:
name: Test Results
path: "build/reports/tests/**"
5 changes: 5 additions & 0 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,8 @@ jobs:
with:
name: ZSON
path: "**/zson-*.jar"
- name: Upload test results
uses: actions/upload-artifact@v3
with:
name: Test Results
path: "build/reports/tests/**"

0 comments on commit 0ff8ad9

Please sign in to comment.