diff --git a/.bazelrc b/.bazelrc index 5f3d2e407c..6036962611 100644 --- a/.bazelrc +++ b/.bazelrc @@ -125,10 +125,10 @@ build:remote-ci-common --spawn_strategy=remote,sandboxed,local # sends a keepalive if we don't receive any messages (server updates every 60s). build:remote-ci-common --grpc_keepalive_time=61s ############################################################################# -# remote-ci-local-java8: Use a local Java 8 (JDK) +# remote-ci-local-java11: Use a local Java 11 (JDK) ############################################################################# -build:remote-ci-local-java8 --java_runtime_version=local_jdk -build:remote-ci-local-java8 --java_language_version=8 +build:remote-ci-local-java11 --java_runtime_version=local_jdk +build:remote-ci-local-java11 --java_language_version=11 ############################################################################# # remote-ci-linux: These options are linux-only using GCC by default ############################################################################# diff --git a/.bazelversion b/.bazelversion deleted file mode 120000 index 9da24ef26b..0000000000 --- a/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -envoy/.bazelversion \ No newline at end of file diff --git a/.bazelversion b/.bazelversion new file mode 100644 index 0000000000..864f3a11f2 --- /dev/null +++ b/.bazelversion @@ -0,0 +1 @@ +6.0.0-pre.20220414.2 diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml index 9626130b29..42b35e7679 100644 --- a/.github/workflows/android_build.yml +++ b/.github/workflows/android_build.yml @@ -24,12 +24,12 @@ jobs: - run: echo "Found envoy.aar from previous run!" if: steps.check-cache.outputs.cache-hit == 'true' name: 'Build cache hit' - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 if: steps.check-cache.outputs.cache-hit != 'true' with: - java-version: '8' + java-version: '11' java-package: jdk - architecture: x64 + distribution: 'zulu' - name: 'Install dependencies' if: steps.check-cache.outputs.cache-hit != 'true' run: ./ci/mac_ci_setup.sh --android @@ -52,13 +52,11 @@ jobs: - uses: actions/checkout@v1 with: submodules: true - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' java-package: jdk - architecture: x64 - - run: ./ci/mac_ci_setup.sh --android - name: 'Install dependencies' + distribution: 'zulu' - uses: actions/cache@v2 id: check-cache with: @@ -67,19 +65,24 @@ jobs: name: 'Download aar' - run: exit 1 if: steps.check-cache.outputs.cache-hit != 'true' - - name: 'Start simulator' - run: ./ci/mac_start_emulator.sh - # Return to using: - # ./bazelw mobile-install --fat_apk_cpu=x86 --start_app //examples/java/hello_world:hello_envoy - # When https://github.com/envoyproxy/envoy-mobile/issues/853 is fixed. + - name: 'Install android-emulator-runner' + uses: reactivecircus/android-emulator-runner@v2 + with: + api-level: 30 + ndk: 21.3.6528147 + arch: x86_64 + profile: Nexus 6 - name: 'Start java app' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Return to using: + # ./bazelw mobile-install --fat_apk_cpu=x86 --start_app //examples/java/hello_world:hello_envoy + # When https://github.com/envoyproxy/envoy-mobile/issues/853 is fixed. run: | ./bazelw build \ --config=remote-ci-macos \ --remote_header="Authorization=Bearer $GITHUB_TOKEN" \ - --fat_apk_cpu=x86 \ + --fat_apk_cpu=x86_64 \ //examples/java/hello_world:hello_envoy adb install -r --no-incremental bazel-bin/examples/java/hello_world/hello_envoy.apk adb shell am start -n io.envoyproxy.envoymobile.helloenvoy/.MainActivity @@ -94,11 +97,11 @@ jobs: - uses: actions/checkout@v1 with: submodules: true - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' java-package: jdk - architecture: x64 + distribution: 'zulu' - name: 'Install dependencies' run: ./ci/mac_ci_setup.sh - name: 'Download aar' @@ -137,11 +140,11 @@ jobs: - uses: actions/checkout@v1 with: submodules: true - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' java-package: jdk - architecture: x64 + distribution: 'zulu' - name: 'Install dependencies' run: ./ci/mac_ci_setup.sh --android - name: 'Download aar' @@ -180,11 +183,11 @@ jobs: - uses: actions/checkout@v1 with: submodules: true - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' java-package: jdk - architecture: x64 + distribution: 'zulu' - name: 'Install dependencies' run: ./ci/mac_ci_setup.sh - name: 'Download aar' diff --git a/.github/workflows/android_tests.yml b/.github/workflows/android_tests.yml index b1d3803ff0..7eae8cc1c2 100644 --- a/.github/workflows/android_tests.yml +++ b/.github/workflows/android_tests.yml @@ -29,11 +29,11 @@ jobs: fi - name: 'Java setup' if: steps.check_context.outputs.run_tests == 'true' - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' java-package: jdk - architecture: x64 + distribution: 'zulu' - name: 'Install dependencies' if: steps.check_context.outputs.run_tests == 'true' run: ./ci/mac_ci_setup.sh @@ -45,9 +45,7 @@ jobs: ./bazelw test \ --test_output=all \ --build_tests_only \ - --config=remote-ci-macos \ - --config=remote-ci-local-java8 \ - --remote_header="Authorization=Bearer $GITHUB_TOKEN" \ + --config=macos \ //test/kotlin/io/... javatestsmac: name: java_tests_mac @@ -69,11 +67,11 @@ jobs: fi - name: 'Java setup' if: steps.check_context.outputs.run_tests == 'true' - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' java-package: jdk - architecture: x64 + distribution: 'zulu' - name: 'Install dependencies' if: steps.check_context.outputs.run_tests == 'true' run: ./ci/mac_ci_setup.sh @@ -85,9 +83,7 @@ jobs: ./bazelw test \ --test_output=all \ --build_tests_only \ - --config=remote-ci-macos \ - --config=remote-ci-local-java8 \ - --remote_header="Authorization=Bearer $GITHUB_TOKEN" \ + --config=macos \ --define=signal_trace=disabled \ //test/java/... kotlintestslinux: @@ -117,11 +113,11 @@ jobs: fi - name: 'Java setup' if: steps.check_context.outputs.run_tests == 'true' - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' java-package: jdk - architecture: x64 + distribution: 'zulu' - name: 'Run Kotlin library integration tests' if: steps.check_context.outputs.run_tests == 'true' env: @@ -130,7 +126,5 @@ jobs: ./bazelw test \ --test_output=all \ --build_tests_only \ - --config=remote-ci-linux-clang \ - --config=remote-ci-local-java8 \ - --remote_header="Authorization=Bearer $GITHUB_TOKEN" \ + --config=clang \ //test/kotlin/... diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml index 417a0ee86e..e46dbe17e1 100644 --- a/.github/workflows/asan.yml +++ b/.github/workflows/asan.yml @@ -30,12 +30,12 @@ jobs: echo "Skipping tests." echo "::set-output name=run_tests::false" fi - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 if: steps.check-cache.outputs.cache-hit != 'true' with: - java-version: '8' + java-version: '11' java-package: jdk - architecture: x64 + distribution: 'zulu' - name: 'Run tests' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index de19022d20..697372cdd5 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -52,11 +52,11 @@ jobs: - uses: actions/checkout@v1 with: submodules: true - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' java-package: jdk - architecture: x64 + distribution: 'zulu' - run: ./ci/mac_ci_setup.sh name: 'Install dependencies' - name: 'Run Kotlin Lint (Detekt)' @@ -64,7 +64,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | ./bazelw build \ - --config=remote-ci-macos --remote_header="Authorization=Bearer $GITHUB_TOKEN" \ + --config=macos \ //library/kotlin/io/envoyproxy/envoymobile:envoy_lib_lint \ //examples/kotlin/hello_world:hello_envoy_kt_lint - name: 'Run Kotlin Formatter (ktlint)' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 59a6ceaeb3..c1c4e1c1cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,11 +14,11 @@ jobs: - uses: actions/checkout@v1 with: submodules: true - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' java-package: jdk - architecture: x64 + distribution: 'zulu' - run: ./ci/mac_ci_setup.sh --android name: 'Install dependencies' - name: 'Build envoy.aar distributable' diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml index d305c7801b..0f1dbeaa53 100644 --- a/.github/workflows/tsan.yml +++ b/.github/workflows/tsan.yml @@ -30,12 +30,12 @@ jobs: echo "Skipping tests." echo "::set-output name=run_tests::false" fi - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 if: steps.check-cache.outputs.cache-hit != 'true' with: - java-version: '8' + java-version: '11' java-package: jdk - architecture: x64 + distribution: 'zulu' - name: 'Run tests' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/BUILD b/BUILD index 6a3cbca360..7b810d2601 100644 --- a/BUILD +++ b/BUILD @@ -1,4 +1,4 @@ -load("@io_bazel_rules_kotlin//kotlin/internal:toolchains.bzl", "define_kt_toolchain") +load("@io_bazel_rules_kotlin//kotlin:core.bzl", "define_kt_toolchain") licenses(["notice"]) # Apache 2 diff --git a/bazel/envoy_mobile_dependencies.bzl b/bazel/envoy_mobile_dependencies.bzl index 5cecea314d..f34aa89997 100644 --- a/bazel/envoy_mobile_dependencies.bzl +++ b/bazel/envoy_mobile_dependencies.bzl @@ -3,7 +3,7 @@ load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependenci load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies") load("@rules_jvm_external//:defs.bzl", "maven_install") load("@rules_detekt//detekt:dependencies.bzl", "rules_detekt_dependencies") -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories") +load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories") load("@io_grpc_grpc_java//:repositories.bzl", "grpc_java_repositories") load("@rules_proto_grpc//protobuf:repositories.bzl", "protobuf_repos") load("@rules_proto_grpc//java:repositories.bzl", rules_proto_grpc_java_repos = "java_repos") @@ -74,8 +74,8 @@ def kotlin_dependencies(extra_maven_dependencies = []): # Test artifacts "org.assertj:assertj-core:3.12.0", "junit:junit:4.12", - "org.mockito:mockito-inline:2.28.2", - "org.mockito:mockito-core:2.28.2", + "org.mockito:mockito-inline:4.5.1", + "org.mockito:mockito-core:4.5.1", "com.squareup.okhttp3:okhttp:4.9.1", "com.squareup.okhttp3:mockwebserver:4.9.1", "io.github.classgraph:classgraph:4.8.121", diff --git a/bazel/envoy_mobile_repositories.bzl b/bazel/envoy_mobile_repositories.bzl index cf5dea57e0..431551fb76 100644 --- a/bazel/envoy_mobile_repositories.bzl +++ b/bazel/envoy_mobile_repositories.bzl @@ -72,8 +72,9 @@ def upstream_envoy_overrides(): def swift_repos(): http_archive( name = "build_bazel_rules_apple", - sha256 = "4161b2283f80f33b93579627c3bd846169b2d58848b0ffb29b5d4db35263156a", - url = "https://github.com/bazelbuild/rules_apple/releases/download/0.34.0/rules_apple.0.34.0.tar.gz", + sha256 = "633a7f4b886ddd54db82f36f9103dd86e51d4d9be1247574be536988ea8c70e3", + strip_prefix = "rules_apple-2e6a8c625e519b18803c30fbd5e960061cc4c4af", + url = "https://github.com/bazelbuild/rules_apple/archive/2e6a8c625e519b18803c30fbd5e960061cc4c4af.tar.gz", ) http_archive( @@ -92,17 +93,15 @@ def kotlin_repos(): http_archive( name = "io_bazel_rules_kotlin", - sha256 = "dc1c76f91228ddaf4f7ca4190b82d61939e95369f61dea715e8be28792072b1b", - strip_prefix = "rules_kotlin-legacy-1.3.0-rc2", - type = "zip", - urls = ["https://github.com/bazelbuild/rules_kotlin/archive/legacy-1.3.0-rc2.zip"], + sha256 = "12d22a3d9cbcf00f2e2d8f0683ba87d3823cb8c7f6837568dd7e48846e023307", + url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.5.0/rules_kotlin_release.tgz", ) http_archive( name = "rules_detekt", - sha256 = "b1b4c8a3228f880a169ab60a817619bc4cf254443196e7e108ece411cb9c580e", - strip_prefix = "bazel_rules_detekt-0.3.0", - url = "https://github.com/buildfoundation/bazel_rules_detekt/archive/v0.3.0.tar.gz", + sha256 = "44912c74dc2e164227b1102ef36227d0e78fdbd7c7359868ae13424eb4f0d5c2", + strip_prefix = "bazel_rules_detekt-0.6.0", + url = "https://github.com/buildfoundation/bazel_rules_detekt/archive/refs/tags/v0.6.0.tar.gz", ) # gRPC java for @rules_proto_grpc diff --git a/bazel/envoy_mobile_toolchains.bzl b/bazel/envoy_mobile_toolchains.bzl index 843d367609..52df0e5332 100644 --- a/bazel/envoy_mobile_toolchains.bzl +++ b/bazel/envoy_mobile_toolchains.bzl @@ -1,8 +1,8 @@ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_register_toolchains") +load("@io_bazel_rules_kotlin//kotlin:core.bzl", "kt_register_toolchains") load("@rules_detekt//detekt:toolchains.bzl", "rules_detekt_toolchains") load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_toolchains") def envoy_mobile_toolchains(): kt_register_toolchains() - rules_detekt_toolchains(detekt_version = "1.8.0") + rules_detekt_toolchains(detekt_version = "1.20.0") rules_proto_grpc_toolchains() diff --git a/third_party/rbe_configs/config/BUILD b/third_party/rbe_configs/config/BUILD index 1a8164b8da..8f0f1313b4 100644 --- a/third_party/rbe_configs/config/BUILD +++ b/third_party/rbe_configs/config/BUILD @@ -20,14 +20,10 @@ package(default_visibility = ["//visibility:public"]) toolchain( name = "cc-toolchain", - exec_compatible_with = [ - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:x86_64", - "@bazel_tools//tools/cpp:clang", - ], target_compatible_with = [ "@bazel_tools//platforms:linux", "@bazel_tools//platforms:x86_64", + "@bazel_tools//tools/cpp:clang", ], toolchain = "//third_party/rbe_configs/cc:cc-compiler-k8", toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",