Skip to content

Commit

Permalink
Adjust for new hse-java package name (#20)
Browse files Browse the repository at this point in the history
Signed-off-by: Tristan Partin <tpartin@micron.com>
  • Loading branch information
tristan957 authored Nov 16, 2022
1 parent fa12e18 commit c5796af
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 9 deletions.
18 changes: 16 additions & 2 deletions .github/workflows/builds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- "**/pom.xml"
- .github/workflows/builds.yaml
pull_request:
types: [opened, synchronize, reopened, edited]
types: [opened, synchronize, reopened]
paths:
- "**.java"
- "**/pom.xml"
Expand Down Expand Up @@ -70,10 +70,24 @@ jobs:
path: hse-java/subprojects/hse
ref: ${{ steps.determine-branches.outputs.hse }}

- name: Export Maven local repository
id: maven-local-repository
run: |
local_repository=$(mvn help:evaluate -Dexpression=settings.localRepository --quiet -DforceStdout)
echo "local-repository=$local_repository" >> "$GITHUB_OUTPUT"
- name: Cache Maven dependencies
id: maven-dependencies
uses: actions/cache@v3
with:
path: ${{ steps.maven-local-repository.outputs.local-repository }}
key: maven-dependencies-${{ hashFiles('**/pom.xml') }}

- name: Setup hse-java
run: |
cd hse-java
meson setup builddir --buildtype=release --prefix=/usr
meson setup builddir --fatal-meson-warnings --werror \
--buildtype=release --prefix=/usr -Ddocs=false
- name: Build hse-java
run: |
Expand Down
2 changes: 1 addition & 1 deletion hse/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ This code is derived from the ycsb project.
<version>0.10.3</version>
</dependency>
<dependency>
<groupId>com.micron.hse_project</groupId>
<groupId>io.github.hse-project</groupId>
<artifactId>hse</artifactId>
<version>3.0.0</version>
</dependency>
Expand Down
12 changes: 6 additions & 6 deletions hse/src/main/java/site/ycsb/db/HseClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
import java.util.Vector;
import java.util.concurrent.atomic.AtomicInteger;

import com.micron.hse_project.hse.Hse;
import com.micron.hse_project.hse.HseException;
import com.micron.hse_project.hse.Kvdb;
import com.micron.hse_project.hse.Kvs;
import com.micron.hse_project.hse.KvsCursor;
import com.micron.hse_project.hse.Limits;
import io.github.hse_project.hse.Hse;
import io.github.hse_project.hse.HseException;
import io.github.hse_project.hse.Kvdb;
import io.github.hse_project.hse.Kvs;
import io.github.hse_project.hse.KvsCursor;
import io.github.hse_project.hse.Limits;

import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVParser;
Expand Down

0 comments on commit c5796af

Please sign in to comment.