Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,20 @@ jobs:
jdk: [11]
schema:
- env: latest
image: "ghcr.io/hydrologicengineeringcenter/cwms-database/cwms/database-ready-ora-23.5:latest-dev"
image: "ghcr.io/hydrologicengineeringcenter/cwms-database/cwms/database-ready-ora-23.5:main"
- env: release
image: "ghcr.io/hydrologicengineeringcenter/cwms-database/cwms/database-ready-ora-23.5:25.07.01"
name: build and test (jdk ${{matrix.jdk}}, schema ${{matrix.schema.env}})
runs-on: ubuntu-latest
outputs:
thewar: ${{steps.thebuild.outputs.WARFILE}}
steps:
- name: Clean up disk space, so we don't run out.
if: matrix.platform == 'ubuntu-latest'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if: matrix.platform == 'ubuntu-latest'

I just realized this block probably isn.t even running since the platform isn't in the matrix. On my fork I got "disk out of space" and after removing that tests are actually running.

run: |
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/lib/android
sudo rm -rf /opt/ghc
- name: checkout code
uses: actions/[email protected]
- name: setup java
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ jobs:
api_image: ${{steps.set_image.outputs.api_image}}
migration_image: ${{steps.migration-publish.outputs.image}}
steps:
- name: Clean up disk space, so we don't run out.
if: matrix.platform == 'ubuntu-latest'
run: |
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/lib/android
sudo rm -rf /opt/ghc
- name: checkout code
uses: actions/[email protected]
with:
Expand Down
6 changes: 3 additions & 3 deletions cwms-data-api/src/main/java/cwms/cda/api/BlobController.java
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public void getAll(@NotNull Context ctx) {
public void getOne(@NotNull Context ctx, @NotNull String blobId) {

try (final Timer.Context ignored = markAndTime(GET_ONE)) {
String idQueryParam = ctx.queryParam(CLOB_ID);
String idQueryParam = ctx.queryParam(BLOB_ID);
if (idQueryParam != null) {
blobId = idQueryParam;
}
Expand Down Expand Up @@ -235,7 +235,7 @@ public void create(@NotNull Context ctx) {
@Override
public void update(@NotNull Context ctx, @NotNull String blobId) {
try (final Timer.Context ignored = markAndTime(UPDATE)) {
String idQueryParam = ctx.queryParam(CLOB_ID);
String idQueryParam = ctx.queryParam(BLOB_ID);
if (idQueryParam != null) {
blobId = idQueryParam;
}
Expand Down Expand Up @@ -287,7 +287,7 @@ public void update(@NotNull Context ctx, @NotNull String blobId) {
@Override
public void delete(@NotNull Context ctx, @NotNull String blobId) {
try (Timer.Context ignored = markAndTime(DELETE)) {
String idQueryParam = ctx.queryParam(CLOB_ID);
String idQueryParam = ctx.queryParam(BLOB_ID);
if (idQueryParam != null) {
blobId = idQueryParam;
}
Expand Down
Loading