Skip to content
Merged
Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
e6188ae
testing out all platforms t1
cyip10 Sep 9, 2024
b1f18ce
uncomment first part of java-cd
cyip10 Sep 9, 2024
3839dea
comment out environment
cyip10 Sep 9, 2024
fb0d1f3
add java version
cyip10 Sep 9, 2024
7f1a623
fix java version placement
cyip10 Sep 9, 2024
7d5e376
change build.gradle
cyip10 Sep 9, 2024
d0203a1
change build.gradle
cyip10 Sep 9, 2024
20cb31a
remove application
cyip10 Sep 9, 2024
8c81419
add classifiers to benchmarks
cyip10 Sep 9, 2024
9a81f32
change examples build file
cyip10 Sep 9, 2024
5b95d79
remove export
cyip10 Sep 10, 2024
537eef6
check
cyip10 Sep 10, 2024
8b99070
remove commented out code
cyip10 Sep 10, 2024
1b5b5a7
fix
cyip10 Sep 11, 2024
a1a5f98
add release version
cyip10 Sep 11, 2024
b56319c
new v
cyip10 Sep 11, 2024
ffc41e4
change benchmark gradle
cyip10 Sep 11, 2024
879845a
add classifiers
cyip10 Sep 11, 2024
ff886c5
check redis
cyip10 Sep 11, 2024
8b11fdb
remove unnecessary file
cyip10 Sep 11, 2024
111f8a5
check redis
cyip10 Sep 11, 2024
6addb84
fix parse error
cyip10 Sep 11, 2024
136aee6
fix parse error
cyip10 Sep 11, 2024
ebab9bc
fix parse error
cyip10 Sep 11, 2024
5ca9b12
add redis
cyip10 Sep 11, 2024
d4afea9
add env variable
cyip10 Sep 11, 2024
17854b1
add validation fail part
cyip10 Sep 12, 2024
6fb0bc0
include steps
cyip10 Sep 12, 2024
c9db9a0
fix spacing
cyip10 Sep 12, 2024
edac22e
add runs on
cyip10 Sep 12, 2024
b7bcde5
add needs part
cyip10 Sep 12, 2024
75a6411
add deployment ID
cyip10 Sep 12, 2024
57657eb
add verbose line
cyip10 Sep 12, 2024
1be621e
clean up file
cyip10 Sep 12, 2024
8fc27ba
fix spacing
cyip10 Sep 12, 2024
b52757d
Merge branch 'main' into CI/maven_testing
cyip10 Sep 12, 2024
5cd3427
address comments, revert files, add back in missing test
cyip10 Sep 12, 2024
dcee12d
remove extra line
cyip10 Sep 12, 2024
c0ab2e7
change publish release to maven to follow order procedure
cyip10 Sep 12, 2024
bfb8d48
change to valkey server
cyip10 Sep 13, 2024
7528b4f
Merge branch 'main' into CI/maven_testing
cyip10 Sep 13, 2024
e7ef670
add changelog
cyip10 Sep 13, 2024
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
51 changes: 42 additions & 9 deletions .github/workflows/java-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,25 @@ jobs:
echo "Deployment ${{ env.DEPLOYMENT_ID }} was unsuccessful with status $DEPLOYMENT_STATUS"
exit 1

test-deployment-on-all-architectures:
needs: [set-release-version, load-platform-matrix, publish-to-maven-central-deployment]
env:
JAVA_VERSION: "11"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

ok - fine. good enough.

RELEASE_VERSION: ${{ needs.set-release-version.outputs.RELEASE_VERSION }}
strategy:
# Run all jobs
fail-fast: false
matrix:
host: ${{ fromJson(needs.load-platform-matrix.outputs.PLATFORM_MATRIX) }}

runs-on: ${{ matrix.host.RUNNER }}
steps:
- name: Start Valkey server
uses: ./.github/actions/install-valkey
with:
engine-version: "7.2.5"
target: ${{ matrix.host.TARGET }}

- uses: actions/checkout@v4
with:
submodules: recursive
Expand All @@ -219,7 +238,14 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "11"
java-version: ${{ env.JAVA_VERSION }}

- name: Install shared software dependencies
uses: ./.github/workflows/install-shared-dependencies
with:
os: ${{ matrix.host.OS }}
target: ${{ matrix.host.TARGET }}
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install protoc (protobuf)
uses: arduino/setup-protoc@v3
Expand All @@ -235,16 +261,9 @@ jobs:
export GLIDE_RELEASE_VERSION=${{ env.RELEASE_VERSION }}
./gradlew :benchmarks:run --args="--minimal --clients glide"

- name: Drop deployment if validation fails
if: ${{ failure() }}
run: |
curl --request DELETE \
-u "${{ secrets.CENTRAL_TOKEN_USERNAME }}:${{ secrets.CENTRAL_TOKEN_PASSWORD }}" \
"https://central.sonatype.com/api/v1/publisher/deployment/${{ env.DEPLOYMENT_ID }}"

publish-release-to-maven:
Comment thread
cyip10 marked this conversation as resolved.
if: ${{ inputs.maven_publish == true || github.event_name == 'push' }}
needs: [publish-to-maven-central-deployment]
needs: [test-deployment-on-all-architectures]
runs-on: ubuntu-latest
environment: AWS_ACTIONS
env:
Expand All @@ -255,3 +274,17 @@ jobs:
curl --request POST \
-u "${{ secrets.CENTRAL_TOKEN_USERNAME }}:${{ secrets.CENTRAL_TOKEN_PASSWORD }}" \
"https://central.sonatype.com/api/v1/publisher/deployment/${{ env.DEPLOYMENT_ID }}"

drop-deployment-if-validation-fails:
if: ${{ failure() }}
needs: [publish-to-maven-central-deployment, test-deployment-on-all-architectures]
runs-on: ubuntu-latest
env:
DEPLOYMENT_ID: ${{ needs.publish-to-maven-central-deployment.outputs.DEPLOYMENT_ID }}
steps:
- name: Drop deployment if validation fails
run: |
curl --request DELETE \
-u "${{ secrets.CENTRAL_TOKEN_USERNAME }}:${{ secrets.CENTRAL_TOKEN_PASSWORD }}" \
"https://central.sonatype.com/api/v1/publisher/deployment/${{ env.DEPLOYMENT_ID }}"

3 changes: 2 additions & 1 deletion java/benchmarks/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
// Apply the application plugin to add support for building a CLI application in Java.
id 'application'
id "com.google.osdetector" version "1.7.3"
}

repositories {
Expand All @@ -12,7 +13,7 @@ dependencies {
def releaseVersion = System.getenv("GLIDE_RELEASE_VERSION");

if (releaseVersion) {
implementation "io.valkey:valkey-glide:" + releaseVersion
implementation "io.valkey:valkey-glide:" + releaseVersion + ":${osdetector.classifier}"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🌟

} else {
implementation project(':client')
}
Expand Down