diff options
| -rw-r--r-- | .github/workflows/third_party_update.yml | 24 | ||||
| -rw-r--r-- | .gitignore | 3 |
2 files changed, 16 insertions, 11 deletions
diff --git a/.github/workflows/third_party_update.yml b/.github/workflows/third_party_update.yml index 17f8f1f75..e26506f65 100644 --- a/.github/workflows/third_party_update.yml +++ b/.github/workflows/third_party_update.yml @@ -13,6 +13,7 @@ env: TMPDIR: "/tmp" BOT_USERNAME: ${{ secrets.BOT_MASTER_RW_GITHUB_USERNAME }} BOT_TOKEN: ${{ secrets.BOT_MASTER_RW_GITHUB_TOKEN }} + GREP_VERSION_CLASSES: "[[:digit:]]\{1,\}[.][[:digit:]]\{1,\}[.][[:digit:]]\{1,\}" jobs: gradle-update: @@ -29,14 +30,15 @@ jobs: run: ./scripts/ci/ci_setup.sh - name: update-to-latest-gradle run: | - LATEST_VERSION=$(curl --silent -u "${BOT_USERNAME}:${BOT_TOKEN}" https://api.github.com/repos/gradle/gradle/releases | jq -c -r '.[] | select(.prerelease == false) | .name' | head -n 1) + LATEST_VERSION=$(curl --silent -u "${BOT_USERNAME}:${BOT_TOKEN}" https://api.github.com/repos/gradle/gradle/releases | jq -c -r '.[] | select(.prerelease == false) | .name' | grep -o "${GREP_VERSION_CLASSES}" | uniq | sort -r | head -n 1) echo "Found version '${LATEST_VERSION}'." ./gradlew wrapper --gradle-version="${LATEST_VERSION}" - name: Sanity verification run: ./gradlew :api:assembleDebug :api:lintDebug - name: Add changed gradle files run: | - git add . + git add -f gradlew* + git add -f gradle/wrapper git add -f gradle/wrapper/gradle-wrapper.jar - name: Create pull request uses: peter-evans/create-pull-request@v2.4.0 @@ -63,9 +65,9 @@ jobs: run: ./scripts/ci/ci_setup.sh - name: update-to-latest-robolectric run: | - LATEST_VERSION=$(curl --silent -u "${BOT_USERNAME}:${BOT_TOKEN}" https://api.github.com/repos/robolectric/robolectric/releases | jq -c -r '.[] | .tag_name' | head -n 1 | grep -wo "[[:digit:]]*.[[:digit:]]*.[[:digit:]]*") + LATEST_VERSION=$(curl --silent -u "${BOT_USERNAME}:${BOT_TOKEN}" https://api.github.com/repos/robolectric/robolectric/releases | jq -c -r '.[] | .tag_name' | grep -o "${GREP_VERSION_CLASSES}" | uniq | sort -r | head -n 1) echo "Found version '${LATEST_VERSION}'." - sed "s/robolectricVersion[[:space:]]=[[:space:]]'[[:digit:]]*.[[:digit:]]*.[[:digit:]]*'/robolectricVersion = '${LATEST_VERSION}'/g" gradle/root_all_projects_ext.gradle > /tmp/output.file + sed "s/robolectricVersion[[:space:]]=[[:space:]]'${GREP_VERSION_CLASSES}'/robolectricVersion = '${LATEST_VERSION}'/g" gradle/root_all_projects_ext.gradle > /tmp/output.file cp /tmp/output.file gradle/root_all_projects_ext.gradle - name: Sanity verification run: | @@ -99,9 +101,9 @@ jobs: run: ./scripts/ci/ci_setup.sh - name: update-to-latest-build-tools run: | - LATEST_VERSION=$("${ANDROID_HOME}/tools/bin/sdkmanager" --list | grep "build-tools;" | grep -wo "[[:digit:]]*.[[:digit:]]*.[[:digit:]]*" | uniq | sort -r | head -n 1) + LATEST_VERSION=$("${ANDROID_HOME}/tools/bin/sdkmanager" --list | grep "build-tools;" | grep -o "${GREP_VERSION_CLASSES}" | uniq | sort -r | head -n 1) echo "Found version '${LATEST_VERSION}'." - sed "s/androidBuildTools[[:space:]]=[[:space:]]'[[:digit:]]*.[[:digit:]]*.[[:digit:]]*'/androidBuildTools = '${LATEST_VERSION}'/g" gradle/root_all_projects_ext.gradle > /tmp/output.file + sed "s/androidBuildTools[[:space:]]=[[:space:]]'${GREP_VERSION_CLASSES}'/androidBuildTools = '${LATEST_VERSION}'/g" gradle/root_all_projects_ext.gradle > /tmp/output.file cp /tmp/output.file gradle/root_all_projects_ext.gradle - name: Sanity verification run: ./gradlew :api:assembleDebug :api:lintDebug @@ -133,17 +135,17 @@ jobs: run: ./scripts/ci/ci_setup.sh - name: update-to-latest-error-prone-plugin run: | - LATEST_VERSION=$(curl --silent -u "${BOT_USERNAME}:${BOT_TOKEN}" https://api.github.com/repos/tbroyer/gradle-errorprone-plugin/releases | jq -c -r '.[] | .tag_name' | head -n 1 | grep -wo "[[:digit:]]*.[[:digit:]]*.[[:digit:]]*") + LATEST_VERSION=$(curl --silent -u "${BOT_USERNAME}:${BOT_TOKEN}" https://api.github.com/repos/tbroyer/gradle-errorprone-plugin/releases | jq -c -r '.[] | .tag_name' | grep -o "${GREP_VERSION_CLASSES}" | uniq | sort -r | head -n 1) echo "Found version '${LATEST_VERSION}'." - sed "s/net.ltgt.gradle:gradle-errorprone-plugin:[[:digit:]]*.[[:digit:]]*.[[:digit:]]*/net.ltgt.gradle:gradle-errorprone-plugin:${LATEST_VERSION}/g" build.gradle > /tmp/output.file + sed "s/net.ltgt.gradle:gradle-errorprone-plugin:${GREP_VERSION_CLASSES}*/net.ltgt.gradle:gradle-errorprone-plugin:${LATEST_VERSION}/g" build.gradle > /tmp/output.file cp /tmp/output.file build.gradle - sed "s/net.ltgt.gradle:gradle-errorprone-plugin:[[:digit:]]*.[[:digit:]]*.[[:digit:]]*/net.ltgt.gradle:gradle-errorprone-plugin:${LATEST_VERSION}/g" gradle/errorprone.gradle > /tmp/output.file + sed "s/net.ltgt.gradle:gradle-errorprone-plugin:${GREP_VERSION_CLASSES}*/net.ltgt.gradle:gradle-errorprone-plugin:${LATEST_VERSION}/g" gradle/errorprone.gradle > /tmp/output.file cp /tmp/output.file gradle/errorprone.gradle - name: update-to-latest-error-prone-tool run: | - LATEST_VERSION=$(curl --silent -u "${BOT_USERNAME}:${BOT_TOKEN}" https://api.github.com/repos/google/error-prone/releases | jq -c -r '.[] | .tag_name' | head -n 1 | grep -wo "[[:digit:]]*.[[:digit:]]*.[[:digit:]]*") + LATEST_VERSION=$(curl --silent -u "${BOT_USERNAME}:${BOT_TOKEN}" https://api.github.com/repos/google/error-prone/releases | jq -c -r '.[] | .tag_name' | grep -o "${GREP_VERSION_CLASSES}" | uniq | sort -r | head -n 1) echo "Found version '${LATEST_VERSION}'." - sed "s/com.google.errorprone:error_prone_core:[[:digit:]]*.[[:digit:]]*.[[:digit:]]*/com.google.errorprone:error_prone_core:${LATEST_VERSION}/g" gradle/errorprone.gradle > /tmp/output.file + sed "s/com.google.errorprone:error_prone_core:${GREP_VERSION_CLASSES}*/com.google.errorprone:error_prone_core:${LATEST_VERSION}/g" gradle/errorprone.gradle > /tmp/output.file cp /tmp/output.file gradle/errorprone.gradle - name: Sanity verification run: ./gradlew :api:assembleDebug :api:lintDebug diff --git a/.gitignore b/.gitignore index f680a481d..d552e0e0a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ local.properties /codecov.sh outputs/ +#jacoco +*.exec + #ndk stuff .cxx .externalNativeBuild/ |