Revert "Extracting Java Deployment to a different workflow"

This reverts commit faff846.
eifrah-aws · Jun 28, 2024 · 11f8470 · 11f8470
1 parent e4083f4
commit 11f8470
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 202 deletions.
diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -27,8 +27,29 @@ 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
@@ -41,20 +62,39 @@ jobs:
                     - 6.2.14
                     - 7.2.3
                 host:
-                    - {
-                        OS: ubuntu,
-                        RUNNER: ubuntu-latest,
-                        TARGET: x86_64-unknown-linux-gnu
-                    }
-                    - {
-                        OS: macos,
-                        RUNNER: macos-latest,
-                        TARGET: aarch64-apple-darwin
-                    }
+                  - {
+                    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
@@ -78,36 +118,61 @@ jobs:
                   version: "26.1"
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
 
-            - 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: 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: Build java client
               working-directory: java
-              run: ./gradlew --continue build
+              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
 
             - name: Ensure no skipped files by linter
               working-directory: java
               run: ./gradlew spotlessDiagnose | grep 'All formatters are well behaved for all files'
 
-            - uses: ./.github/workflows/test-benchmark
-              with:
-                  language-flag: -java
+            - 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.RUNNER }}
+                  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
 
     build-amazonlinux-latest:
         if: github.repository_owner == 'aws'

diff --git 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 = "255.255.255"
+            version = "0.4.3"
             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
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    implementation group: 'software.amazon.glide', name: 'glide-for-redis', version: '255.255.255', classifier: 'placeholder'
+    implementation group: 'software.amazon.glide', name: 'glide-for-redis', version: '0.4.3', classifier: 'placeholder'
 
     implementation 'redis.clients:jedis:4.4.3'
     implementation 'io.lettuce:lettuce-core:6.2.6.RELEASE'