From 2c13bbdf963475ded9adcf0680d5c3d38392597e Mon Sep 17 00:00:00 2001 From: 0marperez Date: Thu, 6 Feb 2025 09:47:09 -0500 Subject: [PATCH 1/4] fix: don't use gradle to change gradle distribution URL --- .github/actions/configure-gradle/action.yml | 9 +++++++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/actions/configure-gradle/action.yml b/.github/actions/configure-gradle/action.yml index dad822f..affe090 100644 --- a/.github/actions/configure-gradle/action.yml +++ b/.github/actions/configure-gradle/action.yml @@ -12,7 +12,12 @@ runs: shell: bash run: | cd ${{ inputs.working-directory }} + gradleVersion=$(grep "distributionUrl" ./gradle/wrapper/gradle-wrapper.properties | sed -n 's|.*gradle-\([0-9.]*\)-bin.zip|\1|p') + echo Configuring custom Gradle distribution URL with version: $gradleVersion - echo gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-$gradleVersion-bin.zip - gradle wrapper --gradle-distribution-url https://d2pjps8lqszrgq.cloudfront.net/gradle-$gradleVersion-bin.zip \ No newline at end of file + echo Setting distribution URL to: https://d2pjps8lqszrgq.cloudfront.net/gradle-$gradleVersion-bin.zip + + sed -i "/distributionUrl/c\\ + distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-$gradleVersion-bin.zip\\ + " ./gradle/wrapper/gradle-wrapper.properties \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 18362b7..dace2bf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 8d16355d7b6b9bb28dee3ecfe6ccb0e70ac00687 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Thu, 6 Feb 2025 09:53:05 -0500 Subject: [PATCH 2/4] fix: make command cross platform --- .github/actions/configure-gradle/action.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/actions/configure-gradle/action.yml b/.github/actions/configure-gradle/action.yml index affe090..3634142 100644 --- a/.github/actions/configure-gradle/action.yml +++ b/.github/actions/configure-gradle/action.yml @@ -18,6 +18,13 @@ runs: echo Configuring custom Gradle distribution URL with version: $gradleVersion echo Setting distribution URL to: https://d2pjps8lqszrgq.cloudfront.net/gradle-$gradleVersion-bin.zip - sed -i "/distributionUrl/c\\ + # Detect OS and set appropriate sed option + if [[ "$OSTYPE" == "darwin"* ]]; then + SED_OPTS=(-i '') # macOS (BSD sed) requires an empty string after -i + else + SED_OPTS=(-i) # Linux (GNU sed) does not need an empty string + fi + + sed -i "${SED_OPTS[@]}" "/distributionUrl/c\\ distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-$gradleVersion-bin.zip\\ " ./gradle/wrapper/gradle-wrapper.properties \ No newline at end of file From 4cf4b1eca298bcfe9b14f343c7b698b730045ab6 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Thu, 6 Feb 2025 10:03:25 -0500 Subject: [PATCH 3/4] test: different variant of previous fix --- .github/actions/configure-gradle/action.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/actions/configure-gradle/action.yml b/.github/actions/configure-gradle/action.yml index 3634142..dfd7503 100644 --- a/.github/actions/configure-gradle/action.yml +++ b/.github/actions/configure-gradle/action.yml @@ -19,12 +19,13 @@ runs: echo Setting distribution URL to: https://d2pjps8lqszrgq.cloudfront.net/gradle-$gradleVersion-bin.zip # Detect OS and set appropriate sed option - if [[ "$OSTYPE" == "darwin"* ]]; then - SED_OPTS=(-i '') # macOS (BSD sed) requires an empty string after -i + if sed --version 2>/dev/null | grep -q "GNU sed"; then + SED_CMD="sed -i" # GNU sed (Linux) else - SED_OPTS=(-i) # Linux (GNU sed) does not need an empty string + SED_CMD="sed -i ''" # BSD sed (macOS) fi - sed -i "${SED_OPTS[@]}" "/distributionUrl/c\\ + # Replace the line containing "distributionUrl" with the new distributionUrl + $SED_CMD "/distributionUrl/c\\ distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-$gradleVersion-bin.zip\\ " ./gradle/wrapper/gradle-wrapper.properties \ No newline at end of file From ec890ba6d053fac5a7ccfdb4d34a10d47d64072d Mon Sep 17 00:00:00 2001 From: 0marperez Date: Thu, 6 Feb 2025 15:54:54 -0500 Subject: [PATCH 4/4] fix: pr feedback v1 --- .github/actions/configure-gradle/action.yml | 9 +++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/actions/configure-gradle/action.yml b/.github/actions/configure-gradle/action.yml index dfd7503..cac7f4a 100644 --- a/.github/actions/configure-gradle/action.yml +++ b/.github/actions/configure-gradle/action.yml @@ -13,10 +13,11 @@ runs: run: | cd ${{ inputs.working-directory }} - gradleVersion=$(grep "distributionUrl" ./gradle/wrapper/gradle-wrapper.properties | sed -n 's|.*gradle-\([0-9.]*\)-bin.zip|\1|p') + GRADLE_VERSION=$(grep "distributionUrl" ./gradle/wrapper/gradle-wrapper.properties | sed -n 's|.*gradle-\([0-9.]*\)-bin.zip|\1|p') + CUSTOM_URL="https://d2pjps8lqszrgq.cloudfront.net/gradle-$GRADLE_VERSION-bin.zip" - echo Configuring custom Gradle distribution URL with version: $gradleVersion - echo Setting distribution URL to: https://d2pjps8lqszrgq.cloudfront.net/gradle-$gradleVersion-bin.zip + echo Configuring custom Gradle distribution URL with version: $GRADLE_VERSION + echo Setting distribution URL to: $CUSTOM_URL # Detect OS and set appropriate sed option if sed --version 2>/dev/null | grep -q "GNU sed"; then @@ -27,5 +28,5 @@ runs: # Replace the line containing "distributionUrl" with the new distributionUrl $SED_CMD "/distributionUrl/c\\ - distributionUrl=https://d2pjps8lqszrgq.cloudfront.net/gradle-$gradleVersion-bin.zip\\ + distributionUrl=$CUSTOM_URL\\ " ./gradle/wrapper/gradle-wrapper.properties \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dace2bf..b136486 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists