From b065ea3642da960fd3d040d894dea733ccc6172b Mon Sep 17 00:00:00 2001 From: Justice Sidhu Date: Wed, 18 Sep 2024 13:48:44 -0700 Subject: [PATCH 1/4] test --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d18d33bda..6f930bbc7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,6 @@ jobs: name: PR Workflow # If any dependent jobs fails, this WF skips which won't block merging PRs # calling always() is required for this WF to run all the time - if: github.repository_owner == 'aws' && always() runs-on: ubuntu-latest needs: - unit-functional @@ -197,7 +196,6 @@ jobs: java-gradle-integration: name: ${{ matrix.os }} / ${{ matrix.python }} / java gradle - if: github.repository_owner == 'aws' runs-on: ${{ matrix.os }} env: GRADLE_OPTS: -Dorg.gradle.daemon=false From 941d85f7f0ddcf2445a1cbf1111783a58270d64e Mon Sep 17 00:00:00 2001 From: Justice Sidhu Date: Wed, 18 Sep 2024 13:59:06 -0700 Subject: [PATCH 2/4] adding debug --- aws_lambda_builders/workflows/java_gradle/gradle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws_lambda_builders/workflows/java_gradle/gradle.py b/aws_lambda_builders/workflows/java_gradle/gradle.py index ffdf38c4d..eb0f461b6 100644 --- a/aws_lambda_builders/workflows/java_gradle/gradle.py +++ b/aws_lambda_builders/workflows/java_gradle/gradle.py @@ -33,7 +33,7 @@ def build(self, source_dir, build_file, cache_dir=None, init_script_path=None, p if not self.os_utils.exists(build_file): raise BuildFileNotFoundError(build_file) - args = ["build", "--build-file", build_file] + args = ["build", "--build-file", build_file, "--debug", "--stacktrace"] if cache_dir is not None: args.extend(["--project-cache-dir", cache_dir]) if properties is not None: From a2b1966e0dd944091e877c9b60fd913be8cab2ff Mon Sep 17 00:00:00 2001 From: Justice Sidhu Date: Wed, 18 Sep 2024 15:56:26 -0700 Subject: [PATCH 3/4] no-build-cache --- aws_lambda_builders/workflows/java_gradle/gradle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws_lambda_builders/workflows/java_gradle/gradle.py b/aws_lambda_builders/workflows/java_gradle/gradle.py index eb0f461b6..a64cb770c 100644 --- a/aws_lambda_builders/workflows/java_gradle/gradle.py +++ b/aws_lambda_builders/workflows/java_gradle/gradle.py @@ -33,7 +33,7 @@ def build(self, source_dir, build_file, cache_dir=None, init_script_path=None, p if not self.os_utils.exists(build_file): raise BuildFileNotFoundError(build_file) - args = ["build", "--build-file", build_file, "--debug", "--stacktrace"] + args = ["build", "--build-file", build_file, "--no-build-cache"] if cache_dir is not None: args.extend(["--project-cache-dir", cache_dir]) if properties is not None: From 996d5956b512adb6e9fe644eb63dd9db65ef3a8c Mon Sep 17 00:00:00 2001 From: Justice Sidhu Date: Wed, 18 Sep 2024 16:49:23 -0700 Subject: [PATCH 4/4] diff java --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f930bbc7..2f491b8dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -203,7 +203,6 @@ jobs: fail-fast: false matrix: os: - - ubuntu-latest - windows-latest python: - "3.8" @@ -218,7 +217,7 @@ jobs: python-version: ${{ matrix.python }} - uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'corretto' java-version: '21' - run: make init - run: pytest -vv tests/integration/workflows/java_gradle