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

Rename cc_toolchain from musl_toolchain #29

Merged
merged 3 commits into from
Jun 13, 2024
Merged

Rename cc_toolchain from musl_toolchain #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a1e15a
Rename cc_toolchain from musl_toolchain
illicitonion Jun 13, 2024
60d86f2
Also update temporary builder test toolchains
illicitonion Jun 13, 2024
2b42b45
Fix up one more name
illicitonion Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 24 additions & 21 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,24 @@ jobs:
&& chmod 0755 /usr/local/bin/bazel
- name: Generate builder workspace file
run: "cat >test-workspaces/builder/WORKSPACE.bazel <<EOF\nload(\"@bazel_tools//tools/build_defs/repo:http.bzl\"\
, \"http_archive\")\n\nhttp_archive(\n name = \"musl_toolchain\",\n \
\ sha256 = \"$(sha256sum musl-1.2.3-platform-x86_64-unknown-linux-gnu-target-x86_64-linux-musl.tar.gz\
, \"http_archive\")\n\nhttp_archive(\n name = \"musl-1_2_3-platform-x86_64-unknown-linux-gnu-target-x86_64-linux-musl\"\
,\n sha256 = \"$(sha256sum musl-1.2.3-platform-x86_64-unknown-linux-gnu-target-x86_64-linux-musl.tar.gz\
\ | awk '{print $1}')\",\n url = \"file://$(pwd)/musl-1.2.3-platform-x86_64-unknown-linux-gnu-target-x86_64-linux-musl.tar.gz\"\
,\n)\n\nEOF\n"
- name: Generate builder workspace config BUILD.bazel file
run: "mkdir -p test-workspaces/builder/config && cat >test-workspaces/builder/config/BUILD.bazel\
\ <<EOF\ntoolchain(\n name = \"musl_toolchain\",\n exec_compatible_with\
\ = [\n \"@platforms//cpu:x86_64\",\n \"@platforms//os:linux\"\
,\n ],\n target_compatible_with = [\n \"@platforms//cpu:x86_64\"\
,\n \"@platforms//os:linux\",\n ],\n toolchain = \"@musl_toolchain//:musl_toolchain\"\
\ <<EOF\ntoolchain(\n name = \"musl-1_2_3-platform-x86_64-unknown-linux-gnu-target-x86_64-linux-musl\"\
,\n exec_compatible_with = [\n \"@platforms//cpu:x86_64\",\n \
\ \"@platforms//os:linux\",\n ],\n target_compatible_with = [\n\
\ \"@platforms//cpu:x86_64\",\n \"@platforms//os:linux\",\n\
\ ],\n toolchain = \"@musl-1_2_3-platform-x86_64-unknown-linux-gnu-target-x86_64-linux-musl\"\
,\n toolchain_type = \"@bazel_tools//tools/cpp:toolchain_type\",\n)\n\n\
platform(\n name = \"platform\",\n constraint_values = [\n \"\
@platforms//cpu:x86_64\",\n \"@platforms//os:linux\",\n ],\n)\n\n\
EOF\n"
- name: Build test binary and test with musl
run: cd test-workspaces/builder && BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 bazel
build //:binary //:test --platforms=//config:platform --extra_toolchains=//config:musl_toolchain
build //:binary //:test --platforms=//config:platform --extra_toolchains=//config:musl-1_2_3-platform-x86_64-unknown-linux-gnu-target-x86_64-linux-musl
--incompatible_enable_cc_toolchain_resolution
- name: Move test binary
run: mkdir output && cp test-workspaces/builder/bazel-bin/binary output/test-binary-platform-x86_64-unknown-linux-gnu-target-x86_64-linux-musl
Expand Down Expand Up @@ -99,23 +100,24 @@ jobs:
run: bazel --version
- name: Generate builder workspace file
run: "cat >test-workspaces/builder/WORKSPACE.bazel <<EOF\nload(\"@bazel_tools//tools/build_defs/repo:http.bzl\"\
, \"http_archive\")\n\nhttp_archive(\n name = \"musl_toolchain\",\n \
\ sha256 = \"$(shasum -a 256 musl-1.2.3-platform-x86_64-apple-darwin-target-x86_64-linux-musl.tar.gz\
, \"http_archive\")\n\nhttp_archive(\n name = \"musl-1_2_3-platform-x86_64-apple-darwin-target-x86_64-linux-musl\"\
,\n sha256 = \"$(shasum -a 256 musl-1.2.3-platform-x86_64-apple-darwin-target-x86_64-linux-musl.tar.gz\
\ | awk '{print $1}')\",\n url = \"file://$(pwd)/musl-1.2.3-platform-x86_64-apple-darwin-target-x86_64-linux-musl.tar.gz\"\
,\n)\n\nEOF\n"
- name: Generate builder workspace config BUILD.bazel file
run: "mkdir -p test-workspaces/builder/config && cat >test-workspaces/builder/config/BUILD.bazel\
\ <<EOF\ntoolchain(\n name = \"musl_toolchain\",\n exec_compatible_with\
\ = [\n \"@platforms//cpu:x86_64\",\n \"@platforms//os:osx\"\
,\n ],\n target_compatible_with = [\n \"@platforms//cpu:x86_64\"\
,\n \"@platforms//os:linux\",\n ],\n toolchain = \"@musl_toolchain//:musl_toolchain\"\
\ <<EOF\ntoolchain(\n name = \"musl-1_2_3-platform-x86_64-apple-darwin-target-x86_64-linux-musl\"\
,\n exec_compatible_with = [\n \"@platforms//cpu:x86_64\",\n \
\ \"@platforms//os:osx\",\n ],\n target_compatible_with = [\n \
\ \"@platforms//cpu:x86_64\",\n \"@platforms//os:linux\",\n \
\ ],\n toolchain = \"@musl-1_2_3-platform-x86_64-apple-darwin-target-x86_64-linux-musl\"\
,\n toolchain_type = \"@bazel_tools//tools/cpp:toolchain_type\",\n)\n\n\
platform(\n name = \"platform\",\n constraint_values = [\n \"\
@platforms//cpu:x86_64\",\n \"@platforms//os:linux\",\n ],\n)\n\n\
EOF\n"
- name: Build test binary and test with musl
run: cd test-workspaces/builder && BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 bazel
build //:binary //:test --platforms=//config:platform --extra_toolchains=//config:musl_toolchain
build //:binary //:test --platforms=//config:platform --extra_toolchains=//config:musl-1_2_3-platform-x86_64-apple-darwin-target-x86_64-linux-musl
--incompatible_enable_cc_toolchain_resolution
- name: Move test binary
run: mkdir output && cp test-workspaces/builder/bazel-bin/binary output/test-binary-platform-x86_64-apple-darwin-target-x86_64-linux-musl
Expand Down Expand Up @@ -155,23 +157,24 @@ jobs:
run: bazel --version
- name: Generate builder workspace file
run: "cat >test-workspaces/builder/WORKSPACE.bazel <<EOF\nload(\"@bazel_tools//tools/build_defs/repo:http.bzl\"\
, \"http_archive\")\n\nhttp_archive(\n name = \"musl_toolchain\",\n \
\ sha256 = \"$(shasum -a 256 musl-1.2.3-platform-aarch64-apple-darwin-target-x86_64-linux-musl.tar.gz\
, \"http_archive\")\n\nhttp_archive(\n name = \"musl-1_2_3-platform-aarch64-apple-darwin-target-x86_64-linux-musl\"\
,\n sha256 = \"$(shasum -a 256 musl-1.2.3-platform-aarch64-apple-darwin-target-x86_64-linux-musl.tar.gz\
\ | awk '{print $1}')\",\n url = \"file://$(pwd)/musl-1.2.3-platform-aarch64-apple-darwin-target-x86_64-linux-musl.tar.gz\"\
,\n)\n\nEOF\n"
- name: Generate builder workspace config BUILD.bazel file
run: "mkdir -p test-workspaces/builder/config && cat >test-workspaces/builder/config/BUILD.bazel\
\ <<EOF\ntoolchain(\n name = \"musl_toolchain\",\n exec_compatible_with\
\ = [\n \"@platforms//cpu:arm64\",\n \"@platforms//os:osx\"\
,\n ],\n target_compatible_with = [\n \"@platforms//cpu:x86_64\"\
,\n \"@platforms//os:linux\",\n ],\n toolchain = \"@musl_toolchain//:musl_toolchain\"\
\ <<EOF\ntoolchain(\n name = \"musl-1_2_3-platform-aarch64-apple-darwin-target-x86_64-linux-musl\"\
,\n exec_compatible_with = [\n \"@platforms//cpu:arm64\",\n \
\ \"@platforms//os:osx\",\n ],\n target_compatible_with = [\n \
\ \"@platforms//cpu:x86_64\",\n \"@platforms//os:linux\",\n \
\ ],\n toolchain = \"@musl-1_2_3-platform-aarch64-apple-darwin-target-x86_64-linux-musl\"\
,\n toolchain_type = \"@bazel_tools//tools/cpp:toolchain_type\",\n)\n\n\
platform(\n name = \"platform\",\n constraint_values = [\n \"\
@platforms//cpu:x86_64\",\n \"@platforms//os:linux\",\n ],\n)\n\n\
EOF\n"
- name: Build test binary and test with musl
run: cd test-workspaces/builder && BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 bazel
build //:binary //:test --platforms=//config:platform --extra_toolchains=//config:musl_toolchain
build //:binary //:test --platforms=//config:platform --extra_toolchains=//config:musl-1_2_3-platform-aarch64-apple-darwin-target-x86_64-linux-musl
--incompatible_enable_cc_toolchain_resolution
- name: Move test binary
run: mkdir output && cp test-workspaces/builder/bazel-bin/binary output/test-binary-platform-aarch64-apple-darwin-target-x86_64-linux-musl
Expand Down
Loading
Loading