From 17f624cb5b6b9ce2f8db3d1a784e09bf66a09b30 Mon Sep 17 00:00:00 2001 From: Daz DeBoer Date: Tue, 28 Sep 2021 20:31:11 -0600 Subject: [PATCH] Rename 'basic' sample to 'groovy-dsl' --- .github/workflows/integTest-caching.yml | 10 +++++----- .github/workflows/integTest-execution.yml | 2 +- .github/workflows/integTest-gradle-user-home.yml | 6 +++--- .../samples/{basic => groovy-dsl}/.gitattributes | 0 __tests__/samples/{basic => groovy-dsl}/.gitignore | 0 .../samples/{basic => groovy-dsl}/build.gradle | 0 .../samples/{basic => groovy-dsl}/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 __tests__/samples/{basic => groovy-dsl}/gradlew | 0 __tests__/samples/{basic => groovy-dsl}/gradlew.bat | 0 .../samples/{basic => groovy-dsl}/settings.gradle | 0 .../src/test/java/basic/BasicTest.java | 0 13 files changed, 9 insertions(+), 9 deletions(-) rename __tests__/samples/{basic => groovy-dsl}/.gitattributes (100%) rename __tests__/samples/{basic => groovy-dsl}/.gitignore (100%) rename __tests__/samples/{basic => groovy-dsl}/build.gradle (100%) rename __tests__/samples/{basic => groovy-dsl}/gradle.properties (100%) rename __tests__/samples/{basic => groovy-dsl}/gradle/wrapper/gradle-wrapper.jar (100%) rename __tests__/samples/{basic => groovy-dsl}/gradle/wrapper/gradle-wrapper.properties (100%) rename __tests__/samples/{basic => groovy-dsl}/gradlew (100%) rename __tests__/samples/{basic => groovy-dsl}/gradlew.bat (100%) rename __tests__/samples/{basic => groovy-dsl}/settings.gradle (100%) rename __tests__/samples/{basic => groovy-dsl}/src/test/java/basic/BasicTest.java (100%) diff --git a/.github/workflows/integTest-caching.yml b/.github/workflows/integTest-caching.yml index a7c9827..494f81d 100644 --- a/.github/workflows/integTest-caching.yml +++ b/.github/workflows/integTest-caching.yml @@ -22,12 +22,12 @@ jobs: - name: Build using Gradle wrapper uses: ./ with: - build-root-directory: __tests__/samples/basic + build-root-directory: __tests__/samples/groovy-dsl arguments: test - name: Build with configuration-cache enabled uses: ./ with: - build-root-directory: __tests__/samples/basic + build-root-directory: __tests__/samples/groovy-dsl arguments: test --configuration-cache # Test that the gradle-user-home cache will cache dependencies, by running build with --offline @@ -43,7 +43,7 @@ jobs: - name: Execute Gradle build with --offline uses: ./ with: - build-root-directory: __tests__/samples/basic + build-root-directory: __tests__/samples/groovy-dsl arguments: test --offline cache-read-only: true @@ -60,7 +60,7 @@ jobs: - name: Execute Gradle build and verify tasks from cache uses: ./ with: - build-root-directory: __tests__/samples/basic + build-root-directory: __tests__/samples/groovy-dsl arguments: test -DverifyCachedBuild=true cache-read-only: true @@ -79,6 +79,6 @@ jobs: env: VERIFY_CACHED_CONFIGURATION: true with: - build-root-directory: __tests__/samples/basic + build-root-directory: __tests__/samples/groovy-dsl arguments: test --configuration-cache cache-read-only: true diff --git a/.github/workflows/integTest-execution.yml b/.github/workflows/integTest-execution.yml index 3d3c445..40e9e6f 100644 --- a/.github/workflows/integTest-execution.yml +++ b/.github/workflows/integTest-execution.yml @@ -37,6 +37,6 @@ jobs: - name: Test use defined Gradle executable uses: ./ with: - gradle-executable: __tests__/samples/basic/gradlew${{ matrix.script-suffix }} + gradle-executable: __tests__/samples/groovy-dsl/gradlew${{ matrix.script-suffix }} build-root-directory: __tests__/samples/no-wrapper arguments: help -DgradleVersionCheck=7.1.1 \ No newline at end of file diff --git a/.github/workflows/integTest-gradle-user-home.yml b/.github/workflows/integTest-gradle-user-home.yml index 8a9e4b9..e04e6f1 100644 --- a/.github/workflows/integTest-gradle-user-home.yml +++ b/.github/workflows/integTest-gradle-user-home.yml @@ -20,7 +20,7 @@ jobs: - name: Build using Gradle wrapper uses: ./ with: - build-root-directory: __tests__/samples/basic + build-root-directory: __tests__/samples/groovy-dsl arguments: test # Test that the gradle-user-home cache will cache dependencies, by running build with --offline @@ -33,7 +33,7 @@ jobs: - name: Execute Gradle build with --offline uses: ./ with: - build-root-directory: __tests__/samples/basic + build-root-directory: __tests__/samples/groovy-dsl arguments: test --offline cache-read-only: true @@ -47,6 +47,6 @@ jobs: - name: Execute Gradle build and verify tasks from cache uses: ./ with: - build-root-directory: __tests__/samples/basic + build-root-directory: __tests__/samples/groovy-dsl arguments: test -DverifyCachedBuild=true cache-read-only: true diff --git a/__tests__/samples/basic/.gitattributes b/__tests__/samples/groovy-dsl/.gitattributes similarity index 100% rename from __tests__/samples/basic/.gitattributes rename to __tests__/samples/groovy-dsl/.gitattributes diff --git a/__tests__/samples/basic/.gitignore b/__tests__/samples/groovy-dsl/.gitignore similarity index 100% rename from __tests__/samples/basic/.gitignore rename to __tests__/samples/groovy-dsl/.gitignore diff --git a/__tests__/samples/basic/build.gradle b/__tests__/samples/groovy-dsl/build.gradle similarity index 100% rename from __tests__/samples/basic/build.gradle rename to __tests__/samples/groovy-dsl/build.gradle diff --git a/__tests__/samples/basic/gradle.properties b/__tests__/samples/groovy-dsl/gradle.properties similarity index 100% rename from __tests__/samples/basic/gradle.properties rename to __tests__/samples/groovy-dsl/gradle.properties diff --git a/__tests__/samples/basic/gradle/wrapper/gradle-wrapper.jar b/__tests__/samples/groovy-dsl/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from __tests__/samples/basic/gradle/wrapper/gradle-wrapper.jar rename to __tests__/samples/groovy-dsl/gradle/wrapper/gradle-wrapper.jar diff --git a/__tests__/samples/basic/gradle/wrapper/gradle-wrapper.properties b/__tests__/samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from __tests__/samples/basic/gradle/wrapper/gradle-wrapper.properties rename to __tests__/samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties diff --git a/__tests__/samples/basic/gradlew b/__tests__/samples/groovy-dsl/gradlew similarity index 100% rename from __tests__/samples/basic/gradlew rename to __tests__/samples/groovy-dsl/gradlew diff --git a/__tests__/samples/basic/gradlew.bat b/__tests__/samples/groovy-dsl/gradlew.bat similarity index 100% rename from __tests__/samples/basic/gradlew.bat rename to __tests__/samples/groovy-dsl/gradlew.bat diff --git a/__tests__/samples/basic/settings.gradle b/__tests__/samples/groovy-dsl/settings.gradle similarity index 100% rename from __tests__/samples/basic/settings.gradle rename to __tests__/samples/groovy-dsl/settings.gradle diff --git a/__tests__/samples/basic/src/test/java/basic/BasicTest.java b/__tests__/samples/groovy-dsl/src/test/java/basic/BasicTest.java similarity index 100% rename from __tests__/samples/basic/src/test/java/basic/BasicTest.java rename to __tests__/samples/groovy-dsl/src/test/java/basic/BasicTest.java