Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust for new hse-java package name (#17) #20

Merged
merged 3 commits into from
Nov 16, 2022
Merged

Adjust for new hse-java package name (#17) #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bb975c
Adjust for new hse-java package name (#17)
tristan957 Nov 16, 2022
0392aad
Use new hse-java groupId (#21)
tristan957 Nov 16, 2022
dfe9bbb
Sync builds workflow
tristan957 Nov 16, 2022
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
18 changes: 16 additions & 2 deletions .github/workflows/builds.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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