Skip to content

Commit

Permalink
Add buck2 CI on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
dtolnay committed May 8, 2023
1 parent 3a0d036 commit b6ffdd4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ jobs:
RUSTFLAGS: --cfg compile_error_if_alloc --cfg cxx_experimental_no_alloc ${{env.RUSTFLAGS}}

buck:
name: Buck2 on ${{matrix.os == 'ubuntu' && 'Linux' || matrix.os == 'macos' && 'macOS' || '???'}}
name: Buck2 on ${{matrix.os == 'ubuntu' && 'Linux' || matrix.os == 'macos' && 'macOS' || matrix.os == 'windows' && 'Windows' || '???'}}
runs-on: ${{matrix.os}}-latest
if: github.event_name != 'pull_request'
strategy:
fail-fast: false
matrix:
os: [ubuntu, macos]
os: [ubuntu, macos, windows]
timeout-minutes: 45
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion tools/buck/prelude
Submodule prelude updated 56 files
+8 −0 abi/BUCK
+6 −0 abi/constraints/BUCK
+72 −76 android/dex_rules.bzl
+6 −1 apple/apple_binary.bzl
+10 −2 apple/apple_bundle.bzl
+41 −12 apple/apple_library.bzl
+1 −0 apple/apple_rules_impl.bzl
+1 −0 apple/apple_toolchain.bzl
+2 −0 apple/apple_toolchain_types.bzl
+5 −5 apple/swift/swift_compilation.bzl
+6 −1 apple/user/apple_selective_debugging.bzl
+1 −0 apple/user/apple_toolchain_override.bzl
+2 −0 apple/user/apple_tools.bzl
+3 −18 command_alias.bzl
+8 −0 cpu/BUCK
+6 −0 cpu/constraints/BUCK
+1 −1 cxx/compile.bzl
+3 −3 cxx/cxx_library.bzl
+1 −1 cxx/cxx_library_utility.bzl
+1 −0 cxx/cxx_toolchain_types.bzl
+4 −1 cxx/cxx_types.bzl
+4 −4 cxx/omnibus.bzl
+52 −6 cxx/preprocessor.bzl
+6 −0 cxx/tools/BUCK
+94 −0 cxx/tools/linker_wrapper.py
+6 −1 decls/core_rules.bzl
+1 −1 decls/cxx_common.bzl
+2 −16 decls/rust_rules.bzl
+2 −2 decls/toolchains_common.bzl
+7 −1 http_archive/http_archive.bzl
+5 −1 java/dex.bzl
+6 −3 java/java_binary.bzl
+19 −6 java/javacd_jar_creator.bzl
+1 −0 java/tools/used_classes_to_dep_file.py
+39 −31 jvm/cd_jar_creator_util.bzl
+13 −6 kotlin/kotlincd_jar_creator.bzl
+18 −0 linking/link_info.bzl
+7 −1 linking/shared_libraries.bzl
+82 −0 os/BUCK
+54 −0 os/constraints/BUCK
+15 −1 python/cxx_python_extension.bzl
+45 −4 python/python_binary.bzl
+4 −2 python/sourcedb/query.bxl
+1 −0 rules_impl.bzl
+56 −30 rust/build.bzl
+8 −1 rust/cargo_package.bzl
+4 −20 rust/link_info.bzl
+12 −2 rust/rust_library.bzl
+3 −5 rust/rust_toolchain.bzl
+20 −0 rust/tools/attrs.bzl
+38 −8 toolchains/cxx.bzl
+5 −10 toolchains/rust.bzl
+0 −7 tools/BUCK
+0 −26 tools/find_and_replace.bat
+4 −0 transitions/constraint_overrides.bzl
+55 −0 utils/cmd_script.bzl
9 changes: 7 additions & 2 deletions tools/buck/toolchains/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,15 @@ load("@prelude//toolchains:rust.bzl", "system_rust_toolchain")

system_cxx_toolchain(
name = "cxx",
cxx_flags = ["-std=c++17"],
cxx_flags = select({
"config//os:linux": ["-std=c++17"],
"config//os:macos": ["-std=c++17"],
"config//os:windows": [],
}),
link_flags = select({
"DEFAULT": ["-lstdc++"],
"config//os:linux": ["-lstdc++"],
"config//os:macos": ["-lc++"],
"config//os:windows": [],
}),
visibility = ["PUBLIC"],
)
Expand Down

0 comments on commit b6ffdd4

Please sign in to comment.