From faff84694a309b0ccf80fa40d58d9c5f9d56bdb2 Mon Sep 17 00:00:00 2001 From: affonsov Date: Thu, 27 Jun 2024 16:23:51 -0700 Subject: [PATCH] Extracting Java Deployment to a different workflow Workflow will only trigger when a tag is pushed to the repo Version is extracted from the tag and replaced in the build.grade files reverted changes of java.yml file --- .github/workflows/java-cd.yml | 179 ++++++++++++++++++++++++++++++++++ .github/workflows/java.yml | 107 ++++---------------- java/client/build.gradle | 2 +- java/examples/build.gradle | 2 +- 4 files changed, 202 insertions(+), 88 deletions(-) create mode 100644 .github/workflows/java-cd.yml diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml new file mode 100644 index 0000000000..57ccae6529 --- /dev/null +++ b/.github/workflows/java-cd.yml @@ -0,0 +1,179 @@ +name: Java Prepare Deployment + +on: + pull_request: + paths: + - .github/workflows/java-cd.yml + - .github/workflows/install-shared-dependencies/action.yml + - .github/workflows/start-self-hosted-runner/action.yml + push: + tags: + - "v*.*" + +concurrency: + group: java-${{ github.head_ref || github.ref }} + cancel-in-progress: true + +permissions: + id-token: write + +jobs: + start-self-hosted-runner: + if: github.repository_owner == 'aws' + runs-on: ubuntu-latest + environment: AWS_ACTIONS + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Start self hosted EC2 runner + uses: ./.github/workflows/start-self-hosted-runner + with: + role-to-assume: ${{ secrets.ROLE_TO_ASSUME }} + aws-region: ${{ secrets.AWS_REGION }} + ec2-instance-id: ${{ secrets.AWS_EC2_INSTANCE_ID }} + + create-binaries-to-publish: + needs: start-self-hosted-runner + if: github.repository_owner == 'aws' + timeout-minutes: 35 + strategy: + # Run all jobs + fail-fast: false + matrix: + java: + - 11 + - 17 + redis: + - 6.2.14 + - 7.2.3 + host: + - { + OS: ubuntu, + RUNNER: ubuntu-latest, + TARGET: x86_64-unknown-linux-gnu, + CLASSIFIER: linux-x86_64 + } + - { + OS: ubuntu, + RUNNER: ["self-hosted", "Linux", "ARM64"], + TARGET: aarch64-unknown-linux-gnu, + CLASSIFIER: linux-aarch_64, + CONTAINER: "2_28" + } + - { + OS: macos, + RUNNER: macos-12, + TARGET: x86_64-apple-darwin, + CLASSIFIER: osx-x86_64 + } + - { + OS: macos, + RUNNER: macos-13-xlarge, + TARGET: aarch64-apple-darwin, + CLASSIFIER: osx-aarch_64 + } + + runs-on: ${{ matrix.host.RUNNER }} + + steps: + - name: Setup self-hosted runner access + if: ${{ contains(matrix.build.RUNNER, 'self-hosted') && matrix.build.TARGET != 'aarch64-unknown-linux-musl' }} + run: sudo chown -R $USER:$USER /home/ubuntu/actions-runner/_work/glide-for-redis + + - uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Set the release version + shell: bash + run: | + export version=`if ${{ github.event_name == 'pull_request' }}; then echo '255.255.255'; else echo ${GITHUB_REF:11}; fi` + echo "RELEASE_VERSION=${version}" >> $GITHUB_ENV + + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + distribution: "temurin" + java-version: ${{ matrix.java }} + + - 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 + with: + version: "26.1" + repo-token: ${{ secrets.GITHUB_TOKEN }} + + - name: Create secret key ring file + working-directory: java/client + run: | + echo "$SECRING_GPG" | base64 --decode > ./secring.gpg + ls -ltr + env: + SECRING_GPG: ${{ secrets.SECRING_GPG }} + + - name: Replace placeholders and version in build.gradle + shell: bash + working-directory: ./java/client + run: | + SED_FOR_MACOS=`if [[ "${{ matrix.host.os }}" =~ .*"macos".* ]]; then echo "''"; fi` + sed -i $SED_FOR_MACOS 's/placeholder/${{ matrix.host.CLASSIFIER }}/g' build.gradle + sed -i $SED_FOR_MACOS "s/255.255.255/${{ env.RELEASE_VERSION }}/g" build.gradle + + - name: Replace placeholders and version in build.gradle for examples + shell: bash + working-directory: ./java/examples + run: | + SED_FOR_MACOS=`if [[ "${{ matrix.host.os }}" =~ .*"macos".* ]]; then echo "''"; fi` + sed -i $SED_FOR_MACOS 's/placeholder/${{ matrix.host.CLASSIFIER }}/g' build.gradle + sed -i $SED_FOR_MACOS "s/255.255.255/${{ env.RELEASE_VERSION }}/g" build.gradle + + + - name: Build java client + working-directory: java + run: | + ./gradlew :client:publishToMavenLocal -Psigning.secretKeyRingFile=secring.gpg -Psigning.password="${{ secrets.GPG_PASSWORD }}" -Psigning.keyId=${{ secrets.GPG_KEY_ID }} + + - name: Ensure no skipped files by linter + working-directory: java + run: ./gradlew spotlessDiagnose | grep 'All formatters are well behaved for all files' + + - name: Bundle JAR + working-directory: java + run: | + src_folder=~/.m2/repository/software/amazon/glide/glide-for-redis/0.4.3 + cd $src_folder + jar -cvf bundle.jar * + ls -ltr + cd - + cp $src_folder/bundle.jar . + + - name: Upload test reports + if: always() + continue-on-error: true + uses: actions/upload-artifact@v4 + with: + name: test-reports-java-${{ matrix.java }}-redis-${{ matrix.redis }}-${{ matrix.host.TARGET }} + path: | + java/client/build/reports/** + java/integTest/build/reports/** + utils/clusters/** + benchmarks/results/** + java/bundle.jar + + - name: Upload artifacts to publish + if: always() + continue-on-error: true + uses: actions/upload-artifact@v4 + with: + name: java-bundle-${{ matrix.java }}-redis-${{ matrix.redis }}-${{ matrix.host.TARGET }} + path: | + java/bundle.jar diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index dfe86a9d87..1fa42a4bc6 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -27,29 +27,8 @@ concurrency: group: java-${{ github.head_ref || github.ref }} cancel-in-progress: true -permissions: - id-token: write - jobs: - start-self-hosted-runner: - if: github.repository_owner == 'aws' - runs-on: ubuntu-latest - environment: AWS_ACTIONS - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Start self hosted EC2 runner - uses: ./.github/workflows/start-self-hosted-runner - with: - role-to-assume: ${{ secrets.ROLE_TO_ASSUME }} - aws-region: ${{ secrets.AWS_REGION }} - ec2-instance-id: ${{ secrets.AWS_EC2_INSTANCE_ID }} - build-and-test-java-client: - needs: start-self-hosted-runner timeout-minutes: 35 strategy: # Run all jobs @@ -62,39 +41,20 @@ jobs: - 6.2.14 - 7.2.3 host: - - { - OS: ubuntu, - RUNNER: ubuntu-latest, - TARGET: x86_64-unknown-linux-gnu, - CLASSIFIER: linux-x86_64 - } - - { - OS: ubuntu, - RUNNER: ["self-hosted", "Linux", "ARM64"], - TARGET: aarch64-unknown-linux-gnu, - CLASSIFIER: linux-aarch_64, - CONTAINER: "2_28" - } - - { - OS: macos, - RUNNER: macos-12, - TARGET: x86_64-apple-darwin, - CLASSIFIER: osx-x86_64 - } - - { - OS: macos, - RUNNER: macos-13-xlarge, - TARGET: aarch64-apple-darwin, - CLASSIFIER: osx-aarch_64 - } + - { + OS: ubuntu, + RUNNER: ubuntu-latest, + TARGET: x86_64-unknown-linux-gnu + } + - { + OS: macos, + RUNNER: macos-latest, + TARGET: aarch64-apple-darwin + } runs-on: ${{ matrix.host.RUNNER }} steps: - - name: Setup self-hosted runner access - if: ${{ contains(matrix.build.RUNNER, 'self-hosted') && matrix.build.TARGET != 'aarch64-unknown-linux-musl' }} - run: sudo chown -R $USER:$USER /home/ubuntu/actions-runner/_work/glide-for-redis - - uses: actions/checkout@v4 with: submodules: recursive @@ -118,61 +78,36 @@ jobs: version: "26.1" repo-token: ${{ secrets.GITHUB_TOKEN }} - - name: Create secret key ring file - working-directory: java/client - run: | - echo "$SECRING_GPG" | base64 --decode > ./secring.gpg - ls -ltr - env: - SECRING_GPG: ${{ secrets.SECRING_GPG }} - - - name: Replace placeholders in build.gradle - shell: bash - working-directory: ./java/client - run: | - SED_FOR_MACOS=`if [[ "${{ matrix.host.os }}" =~ .*"macos".* ]]; then echo "''"; fi` - sed -i $SED_FOR_MACOS 's/placeholder/${{ matrix.host.CLASSIFIER }}/g' build.gradle - - - name: Replace placeholders in build.gradle for examples - shell: bash - working-directory: ./java/examples - run: | - SED_FOR_MACOS=`if [[ "${{ matrix.host.os }}" =~ .*"macos".* ]]; then echo "''"; fi` - sed -i $SED_FOR_MACOS 's/placeholder/${{ matrix.host.CLASSIFIER }}/g' build.gradle + - name: Install redis + # TODO: make this step macos compatible: https://github.com/aws/glide-for-redis/issues/781 + if: ${{ matrix.host.OS == 'ubuntu' }} + uses: ./.github/workflows/install-redis + with: + redis-version: ${{ matrix.redis }} - name: Build java client working-directory: java - run: | - #./gradlew --continue build -Psigning.secretKeyRingFile=secring.gpg -Psigning.password="${{ secrets.GPG_PASSWORD }}" -Psigning.keyId=${{ secrets.GPG_KEY_ID }} - ./gradlew :client:publishToMavenLocal -Psigning.secretKeyRingFile=secring.gpg -Psigning.password="${{ secrets.GPG_PASSWORD }}" -Psigning.keyId=${{ secrets.GPG_KEY_ID }} - ls -ltr ~/.m2/repository/software/amazon/glide + run: ./gradlew --continue build - name: Ensure no skipped files by linter working-directory: java run: ./gradlew spotlessDiagnose | grep 'All formatters are well behaved for all files' - - name: Bundle JAR - working-directory: java - run: | - src_folder=~/.m2/repository/software/amazon/glide/glide-for-redis/0.4.3 - cd $src_folder - jar -cvf bundle.jar * - ls -ltr - cd - - cp $src_folder/bundle.jar . + - uses: ./.github/workflows/test-benchmark + with: + language-flag: -java - name: Upload test reports if: always() continue-on-error: true uses: actions/upload-artifact@v4 with: - name: test-reports-java-${{ matrix.java }}-redis-${{ matrix.redis }}-${{ matrix.host.TARGET }} + name: test-reports-java-${{ matrix.java }}-redis-${{ matrix.redis }}-${{ matrix.host.RUNNER }} path: | java/client/build/reports/** java/integTest/build/reports/** utils/clusters/** benchmarks/results/** - java/bundle.jar build-amazonlinux-latest: if: github.repository_owner == 'aws' diff --git a/java/client/build.gradle b/java/client/build.gradle index 56ee60d234..731a06a8fc 100644 --- a/java/client/build.gradle +++ b/java/client/build.gradle @@ -182,7 +182,7 @@ publishing { from components.java groupId = 'software.amazon.glide' artifactId = 'glide-for-redis' - version = "0.4.3" + version = "255.255.255" pom { name = 'glide-for-valkey' description = 'General Language Independent Driver for the Enterprise (GLIDE) for Valkey' diff --git a/java/examples/build.gradle b/java/examples/build.gradle index 8c5931e50e..0833e093da 100644 --- a/java/examples/build.gradle +++ b/java/examples/build.gradle @@ -10,7 +10,7 @@ repositories { } dependencies { - implementation group: 'software.amazon.glide', name: 'glide-for-redis', version: '0.4.3', classifier: 'placeholder' + implementation group: 'software.amazon.glide', name: 'glide-for-redis', version: '255.255.255', classifier: 'placeholder' implementation 'redis.clients:jedis:4.4.3' implementation 'io.lettuce:lettuce-core:6.2.6.RELEASE'