diff --git a/.github/workflows/run-experiments-androidx.yml b/.github/workflows/run-experiments-androidx.yml index 69a4117..c8f448c 100644 --- a/.github/workflows/run-experiments-androidx.yml +++ b/.github/workflows/run-experiments-androidx.yml @@ -6,10 +6,10 @@ on: env: GRADLE_ENTERPRISE_URL: "https://ge.solutions-team.gradle.com" GIT_REPO: "https://github.com/jprinet/androidx" - GIT_BRANCH: "fix/cache-miss" + GIT_BRANCH: "androidx-main" TASKS: "buildOnServer zipTestConfigsWithApks test" PROJECT_DIR: "playground-projects/biometric-playground" - ARGS: "-x ktlint -Dorg.gradle.dependency.verification=off" + ARGS: "-x lint -Dorg.gradle.dependency.verification=off -Dandroidx.allowCustomCompileSdk=true" jobs: @@ -33,10 +33,10 @@ jobs: run: | echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV echo "JAVA_TOOLS_JAR=$JAVA_HOME/lib/tools.jar" >> $GITHUB_ENV - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: "17" + java-version: "21" distribution: "temurin" - name: "Set environment variables" shell: bash @@ -60,8 +60,20 @@ jobs: git config --global core.hooksPath ~/git-hooks if: matrix.experimentId == 3 - # - name: Run experiment 1 -# uses: gradle/gradle-enterprise-build-validation-scripts/.github/actions/gradle/experiment-1@actions-stable + - name: Run experiment 1 + uses: gradle/gradle-enterprise-build-validation-scripts/.github/actions/gradle/experiment-1@actions-stable + env: + GRADLE_ENTERPRISE_ACCESS_KEY: "${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}" + with: + gitRepo: ${{ env.GIT_REPO }} + gitBranch: ${{ env.GIT_BRANCH }} + tasks: ${{ env.TASKS }} + args: ${{ env.ARGS }} + projectDir: ${{ env.PROJECT_DIR }} + gradleEnterpriseUrl: ${{ env.GRADLE_ENTERPRISE_URL }} + if: matrix.experimentId == 1 +# - name: Run experiment 2 +# uses: gradle/gradle-enterprise-build-validation-scripts/.github/actions/gradle/experiment-2@actions-stable # env: # GRADLE_ENTERPRISE_ACCESS_KEY: "${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}" # with: @@ -71,9 +83,10 @@ jobs: # args: ${{ env.ARGS }} # projectDir: ${{ env.PROJECT_DIR }} # gradleEnterpriseUrl: ${{ env.GRADLE_ENTERPRISE_URL }} -# if: matrix.experimentId == 1 -# - name: Run experiment 2 -# uses: gradle/gradle-enterprise-build-validation-scripts/.github/actions/gradle/experiment-2@actions-stable +# failIfNotFullyCacheable: true +# if: matrix.experimentId == 2 +# - name: Run experiment 3 +# uses: gradle/gradle-enterprise-build-validation-scripts/.github/actions/gradle/experiment-3@actions-stable # env: # GRADLE_ENTERPRISE_ACCESS_KEY: "${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}" # with: @@ -84,17 +97,4 @@ jobs: # projectDir: ${{ env.PROJECT_DIR }} # gradleEnterpriseUrl: ${{ env.GRADLE_ENTERPRISE_URL }} # failIfNotFullyCacheable: true -# if: matrix.experimentId == 2 - - name: Run experiment 3 - uses: gradle/gradle-enterprise-build-validation-scripts/.github/actions/gradle/experiment-3@actions-stable - env: - GRADLE_ENTERPRISE_ACCESS_KEY: "${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}" - with: - gitRepo: ${{ env.GIT_REPO }} - gitBranch: ${{ env.GIT_BRANCH }} - tasks: ${{ env.TASKS }} - args: ${{ env.ARGS }} - projectDir: ${{ env.PROJECT_DIR }} - gradleEnterpriseUrl: ${{ env.GRADLE_ENTERPRISE_URL }} - failIfNotFullyCacheable: true - if: matrix.experimentId == 3 +# if: matrix.experimentId == 3