Fix workflow file.

Author: zzhlogin

.github/workflows/main-build.yml

@@ -1,5 +1,9 @@
 name: Java Agent Main Build
 on:
+  pull_request:
+    branches:
+      - main
+      - "release/v*"
   push:
     branches:
       - main
@@ -184,66 +188,66 @@ jobs:
       image_tag: ${{ github.sha }}
       caller-workflow-name: 'main-build'
 
-  # AppSignals Contract Tests
-  contract-tests:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-java@v4
-        with:
-          java-version: 23
-          distribution: 'temurin'
-      - uses: gradle/wrapper-validation-action@v1
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
-          aws-region: ${{ env.AWS_DEFAULT_REGION }}
-
-      - name: Log in to AWS ECR
-        uses: docker/login-action@v3
-        with:
-          registry: public.ecr.aws
-
-      # cache local patch outputs
-      - name: Cache local Maven repository
-        id: cache-local-maven-repo
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.m2/repository/io/opentelemetry/
-          key: ${{ runner.os }}-maven-local-${{ hashFiles('.github/patches/opentelemetry-java*.patch') }}
-
-      - name: Pull base image of Contract Tests Sample Apps
-        run: docker pull public.ecr.aws/docker/library/amazoncorretto:23-alpine
-
-      - name: Build snapshot with Gradle
-        uses: gradle/gradle-build-action@v3
-        with:
-          arguments: contractTests -PlocalDocker=true
-
-  application-signals-e2e-test:
-    needs: [build]
-    uses: ./.github/workflows/application-signals-e2e-test.yml
-    secrets: inherit
-    with:
-      adot-image-name: ${{ needs.build.outputs.staging-image }}
-
-  publish-build-status:
-    needs: [ build, contract-tests ]
-    if: ${{ always() }}
-    uses: ./.github/workflows/publish-status.yml
-    with:
-      namespace: 'ADOT/GitHubActions'
-      repository: ${{ github.repository }}
-      branch: ${{ github.ref_name }}
-      workflow: main-build
-      success: ${{  needs.build.result == 'success' &&
-                    needs.contract-tests.result == 'success'  }}
-      region: us-east-1
-    secrets:
-      roleArn: ${{ secrets.METRICS_ROLE_ARN }}
+#  # AppSignals Contract Tests
+#  contract-tests:
+#    runs-on: ubuntu-latest
+#    needs: build
+#    steps:
+#      - uses: actions/checkout@v4
+#        with:
+#          fetch-depth: 0
+#      - uses: actions/setup-java@v4
+#        with:
+#          java-version: 23
+#          distribution: 'temurin'
+#      - uses: gradle/wrapper-validation-action@v1
+#
+#      - name: Configure AWS Credentials
+#        uses: aws-actions/configure-aws-credentials@v4
+#        with:
+#          role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
+#          aws-region: ${{ env.AWS_DEFAULT_REGION }}
+#
+#      - name: Log in to AWS ECR
+#        uses: docker/login-action@v3
+#        with:
+#          registry: public.ecr.aws
+#
+#      # cache local patch outputs
+#      - name: Cache local Maven repository
+#        id: cache-local-maven-repo
+#        uses: actions/cache@v3
+#        with:
+#          path: |
+#            ~/.m2/repository/io/opentelemetry/
+#          key: ${{ runner.os }}-maven-local-${{ hashFiles('.github/patches/opentelemetry-java*.patch') }}
+#
+#      - name: Pull base image of Contract Tests Sample Apps
+#        run: docker pull public.ecr.aws/docker/library/amazoncorretto:23-alpine
+#
+#      - name: Build snapshot with Gradle
+#        uses: gradle/gradle-build-action@v3
+#        with:
+#          arguments: contractTests -PlocalDocker=true
+#
+#  application-signals-e2e-test:
+#    needs: [build]
+#    uses: ./.github/workflows/application-signals-e2e-test.yml
+#    secrets: inherit
+#    with:
+#      adot-image-name: ${{ needs.build.outputs.staging-image }}
+#
+#  publish-build-status:
+#    needs: [ build, contract-tests ]
+#    if: ${{ always() }}
+#    uses: ./.github/workflows/publish-status.yml
+#    with:
+#      namespace: 'ADOT/GitHubActions'
+#      repository: ${{ github.repository }}
+#      branch: ${{ github.ref_name }}
+#      workflow: main-build
+#      success: ${{  needs.build.result == 'success' &&
+#                    needs.contract-tests.result == 'success'  }}
+#      region: us-east-1
+#    secrets:
+#      roleArn: ${{ secrets.METRICS_ROLE_ARN }}

.github/workflows/pr-build.yml

@@ -89,6 +89,7 @@ jobs:
           arguments: build integrationTests --stacktrace -PenableCoverage=true -PlocalDocker=true
 
       - name: e2e-test
+        if: ${{ matrix.os == 'ubuntu-latest' }}
         uses: ./.github/workflows/e2e-tests-app-with-java-agent.yml
         with:
           aws-region: 'us-east-1'