Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove redundant SKIP_ICU_BUILD environment variable #6890

Merged
merged 1 commit into from Nov 29, 2021
Merged

Remove redundant SKIP_ICU_BUILD environment variable #6890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
View file
Open in desktop
Expand Up @@ -53,7 +53,7 @@ jobs:
make install

- name: Build
run: ICU_ROOT_DIR=$HOME/icu-bin SKIP_ICU_BUILD=true SKIP_ERRORPRONE=true SKIP_JAVADOC=true ./gradlew clean assemble testClasses --parallel --stacktrace --no-watch-fs
run: ICU_ROOT_DIR=$HOME/icu-bin SKIP_ERRORPRONE=true SKIP_JAVADOC=true ./gradlew clean assemble testClasses --parallel --stacktrace --no-watch-fs

unit-tests:
runs-on: ubuntu-18.04
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:

- name: Run unit tests
run: |
ICU_ROOT_DIR=$HOME/icu-bin SKIP_ICU_BUILD=true SKIP_ERRORPRONE=true SKIP_JAVADOC=true ./gradlew test --info --stacktrace --continue \
ICU_ROOT_DIR=$HOME/icu-bin SKIP_ERRORPRONE=true SKIP_JAVADOC=true ./gradlew test --info --stacktrace --continue \
--parallel \
--no-watch-fs \
-Drobolectric.enabledSdks=${{ matrix.api-versions }} \
Expand Down
4 changes: 2 additions & 2 deletions nativeruntime/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ task cmakeNativeRuntime {
}

task configureICU {
onlyIf { !System.getenv('SKIP_ICU_BUILD') }
onlyIf { !System.getenv('ICU_ROOT_DIR') }
doLast {
def os = osName()
if (!file("$projectDir/external/icu/icu4c/source").exists()) {
Expand All @@ -57,7 +57,7 @@ task configureICU {
}

task buildICU {
onlyIf { !System.getenv('SKIP_ICU_BUILD') }
onlyIf { !System.getenv('ICU_ROOT_DIR') }
dependsOn configureICU
doLast {
exec {
Expand Down