Updated entire repository to account for creation of rules_rust_ext.

bazelbuild · Nov 21, 2024 · f8a6bf3 · f8a6bf3
1 parent 1990e3c
commit f8a6bf3
Show file tree

Hide file tree

Showing 361 changed files with 2,779 additions and 2,635 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -34,7 +34,6 @@ default_macos_targets: &default_macos_targets
 default_windows_targets: &default_windows_targets
   - "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
   - "//..."
-  - "-//test/proto/..."
   - "-//test/unit/pipelined_compilation/..."
 default_windows_no_runfiles_targets: &default_windows_no_runfiles_targets
   - "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
@@ -43,7 +42,6 @@ default_windows_no_runfiles_targets: &default_windows_no_runfiles_targets
   - "-//crate_universe/..."
   - "-//test/chained_direct_deps:mod3_doc_test"
   - "-//test/out_dir_in_tests:demo_lib_doc_test"
-  - "-//test/proto/..."
   - "-//test/rustc_env_files:output_test"
   - "-//test/test_env_launcher:test"
   - "-//test/test_env:test_manifest_dir"
@@ -235,12 +233,9 @@ tasks:
     build_flags:
       - "--enable_bzlmod"
     build_targets:
-      - "//bindgen/3rdparty:bindgen"
       - "//crate_universe:cargo_bazel_bin"
-      - "//proto/prost/private:prost_runtime"
       - "//tools/runfiles"
       - "//util/import"
-      - "//wasm_bindgen/3rdparty:wasm_bindgen"
   ubuntu2004_clang:
     name: With Clang
     platform: ubuntu2004
@@ -467,11 +462,6 @@ tasks:
     windows_targets: &windows_targets
       - "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
       - "//..."
-      # The proto rules do not work on windows
-      - "-//proto/..."
-      # The bindgen rules are currently broken on windows
-      # https://github.com/bazelbuild/rules_rust/issues/2009
-      - "-//bindgen/..."
     build_targets: *windows_targets
     test_targets: *windows_targets
   crate_universe_examples_ubuntu2004:
@@ -834,6 +824,57 @@ tasks:
       - "--compile_one_dependency"
     build_targets:
       - "tools/rust_analyzer/main.rs"
+  extensions_linux:
+    name: Extensions
+    platform: ubuntu2004
+    working_directory: extensions
+    build_flags: *aspects_flags
+    test_flags: *aspects_flags
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
+  extensions_linux_rbe:
+    name: Extensions
+    platform: rbe_ubuntu2004
+    working_directory: extensions
+    shell_commands:
+      - sed -i 's/^# load("@bazel_ci_rules/load("@bazel_ci_rules/' WORKSPACE.bazel
+      - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
+    build_flags: *aspects_flags
+    test_flags: *aspects_flags
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
+  extensions_macos:
+    name: Extensions
+    platform: macos_arm64
+    working_directory: extensions
+    build_flags: *aspects_flags
+    test_flags: *aspects_flags
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
+  extensions_windows:
+    name: Extensions
+    platform: windows
+    working_directory: extensions
+    build_flags: *aspects_flags
+    test_flags: *aspects_flags
+    build_targets:
+      - "--"
+      - "//..."
+      # The bindgen rules are currently broken on windows
+      # https://github.com/bazelbuild/rules_rust/issues/2009
+      - "-//bindgen/..."
+    test_targets:
+      - "--"
+      - "//..."
+      # The bindgen rules are currently broken on windows
+      # https://github.com/bazelbuild/rules_rust/issues/2009
+      - "-//bindgen/..."
 
 buildifier:
   version: latest

diff --git a/.bazelignore b/.bazelignore
@@ -1,9 +1,10 @@
+.direnv
 bzlmod
+crate_universe/private/bootstrap
 docs
 examples
-crate_universe/private/bootstrap
+extensions
 test/aliased_toolchains
 test/bzlmod_repo_mapping
 test/cc_common_link
 test/no_std
-.direnv
diff --git a/.bcr/config.yml b/.bcr/config.yml
@@ -1,3 +1,4 @@
 fixedReleaser:
   login: scentini
   email: [email protected]
+  moduleRoots: [".", "extensions"]
diff --git a/.bcr/extensions/metadata.template.json b/.bcr/extensions/metadata.template.json
@@ -0,0 +1,23 @@
+{
+  "homepage": "https://github.com/bazelbuild/rules_rust/extensions",
+  "maintainers": [
+    {
+        "email": "[email protected]",
+        "github": "UebelAndre",
+        "name": "UebelAndre"
+    },
+    {
+      "email": "[email protected]",
+      "github": "illicitonion",
+      "name": "Daniel Wagner-Hall"
+    },
+    {
+      "email": "[email protected]",
+      "github": "scentini",
+      "name": "Rosica Dejanovska"
+    }
+  ],
+  "repository": ["github:bazelbuild/rules_rust"],
+  "versions": [],
+  "yanked_versions": {}
+}
diff --git a/.bcr/extensions/presubmit.yml b/.bcr/extensions/presubmit.yml
@@ -0,0 +1,15 @@
+bcr_test_module:
+  module_path: "extensions"
+  matrix:
+    platform: ["macos_arm64", "ubuntu2004", "windows"]
+    bazel: ["7.x"]
+  tasks:
+    run_tests:
+      name: "Run test module"
+      platform: ${{ platform }}
+      bazel: ${{ bazel }}
+      # Remove the lockfile because we generate on Bazel 7, but test on Bazel 6 which may not be able to parse a future-generated lockfile.
+      shell_commands:
+        - "rm MODULE.bazel.lock"
+      test_targets:
+        - "//..."
diff --git a/.bcr/extensions/source.template.json b/.bcr/extensions/source.template.json
@@ -0,0 +1,5 @@
+{
+  "integrity": "**leave this alone**",
+  "strip_prefix": "",
+  "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}_ext-{VERSION}.tar.gz"
+}
diff --git a/.bcr/source.template.json b/.bcr/source.template.json
@@ -1,5 +1,5 @@
 {
   "integrity": "**leave this alone**",
   "strip_prefix": "",
-  "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}-v{VERSION}.tar.gz"
+  "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}-{VERSION}.tar.gz"
 }
diff --git a/.gitattributes b/.gitattributes
@@ -1,20 +1,20 @@
 **/*Cargo.Bazel.lock linguist-generated
 **/cargo-bazel-lock.json linguist-generated
-bindgen/3rdparty/crates/** linguist-generated
 crate_universe/3rdparty/crates/** linguist-generated
 crate_universe/test_data/metadata/*/metadata.json linguist-generated
 examples/bzlmod/hello_world/third-party/crates/** linguist-generated
+examples/crate_universe_unnamed/vendor_remote_manifests/crates/** linguist-generated
+examples/crate_universe_unnamed/vendor_remote_pkgs/crates/** linguist-generated
 examples/crate_universe/vendor_external/crates/** linguist-generated
 examples/crate_universe/vendor_local_manifests/crates/** linguist-generated
 examples/crate_universe/vendor_local_pkgs/crates/** linguist-generated
 examples/crate_universe/vendor_remote_manifests/crates/** linguist-generated
 examples/crate_universe/vendor_remote_pkgs/crates/** linguist-generated
-examples/crate_universe_unnamed/vendor_remote_manifests/crates/** linguist-generated
-examples/crate_universe_unnamed/vendor_remote_pkgs/crates/** linguist-generated
 examples/sys/basic/3rdparty/crates/** linguist-generated
 examples/sys/complex/3rdparty/crates/** linguist-generated
-proto/prost/private/3rdparty/crates/** linguist-generated
-proto/protobuf/3rdparty/crates/** linguist-generated
+extensions/bindgen/3rdparty/crates/** linguist-generated
+extensions/prost/private/3rdparty/crates/** linguist-generated
+extensions/protobuf/3rdparty/crates/** linguist-generated
+extensions/wasm_bindgen/3rdparty/crates/** linguist-generated
 tools/rust_analyzer/3rdparty/crates/** linguist-generated
 util/import/3rdparty/crates/** linguist-generated
-wasm_bindgen/3rdparty/crates/** linguist-generated
diff --git a/.github/release_notes.template b/.github/release_notes.template
@@ -1,5 +1,7 @@
 # {version}
 
+Additional documentation can be found at: https://bazelbuild.github.io/rules_rust/#setup
+
 ## Bzlmod
 
 ```python
@@ -13,8 +15,25 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "rules_rust",
     integrity = "sha256-{sha256_base64}",
-    urls = ["https://github.com/bazelbuild/rules_rust/releases/download/{version}/rules_rust-v{version}.tar.gz"],
+    urls = ["https://github.com/bazelbuild/rules_rust/releases/download/{version}/rules_rust-{version}.tar.gz"],
 )
 ```
 
-Additional documentation can be found at: https://bazelbuild.github.io/rules_rust/#setup
+## Extensions
+
+### Bzlmod
+
+```python
+bazel_dep(name = "rules_rust_ext", version = "{version}")
+```
+
+### WORKSPACE
+
+```python
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+http_archive(
+    name = "rules_rust",
+    integrity = "sha256-{ext_sha256_base64}",
+    urls = ["https://github.com/bazelbuild/rules_rust/releases/download/{version}/rules_rust_ext-{version}.tar.gz"],
+)
+```
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -128,29 +128,57 @@ jobs:
       - name: Create the rules archive
         run: |
           # Update urls and sha256 values
-          bazel ${BAZEL_STARTUP_FLAGS[@]}  run //crate_universe/tools/urls_generator -- --artifacts-dir="${ARTIFACTS_DIR}" --url-prefix="${URL_PREFIX}"
+          bazel ${BAZEL_STARTUP_FLAGS[@]} run //crate_universe/tools/urls_generator \
+            -- --artifacts-dir="${ARTIFACTS_DIR}" --url-prefix="${URL_PREFIX}"
+
           bazel clean
+
           # Build an archive of the repo contents.
           # `examples/bzlmod` is included for the BCR presubmit; it must appear before --exclude="examples"
-          tar -czf ${{ github.workspace }}/.github/rules_rust.tar.gz -C ${{ github.workspace }} --exclude=".git" --exclude=".github" --exclude="crate_universe/target" examples/bzlmod --exclude="examples" .
+          tar -czf ${{ github.workspace }}/.github/rules_rust.tar.gz \
+            -C ${{ github.workspace }} \
+            --exclude=".git" --exclude=".github" \
+            --exclude="crate_universe/target" \
+            examples/bzlmod \
+            --exclude="examples" \
+            --exclude="extensions" \
+            .
+
           # Save the sha256 checksum of the distro archive to the environment
           sha256_base64="$(shasum --algorithm 256 ${{ github.workspace }}/.github/rules_rust.tar.gz | awk '{ print $1 }' | xxd -r -p | base64)"
           echo "ARCHIVE_SHA256_BASE64=${sha256_base64}" >> $GITHUB_ENV
         env:
           CARGO_BAZEL_GENERATOR_URL: file://${{ github.workspace }}/crate_universe/target/artifacts/x86_64-unknown-linux-gnu/cargo-bazel
           ARTIFACTS_DIR: ${{ github.workspace }}/crate_universe/target/artifacts
           URL_PREFIX: https://github.com/${{ github.repository_owner }}/rules_rust/releases/download/${{ env.RELEASE_VERSION }}
+      - name: Create the rules extensions archive
+        run: |
+          # Build an archive of the repo contents.
+          tar -czf ${{ github.workspace }}/.github/rules_rust_ext.tar.gz \
+            -C ${{ github.workspace }}/extensions \
+            --exclude="examples" \
+            .
+
+          # Save the sha256 checksum of the distro archive to the environment
+          sha256_base64="$(shasum --algorithm 256 ${{ github.workspace }}/.github/rules_rust_ext.tar.gz | awk '{ print $1 }' | xxd -r -p | base64)"
+          echo "ARCHIVE_EXT_SHA256_BASE64=${sha256_base64}" >> $GITHUB_ENV
       # Upload the artifact in case creating a release fails so all artifacts can then be manually recovered.
       - uses: actions/upload-artifact@v3
         with:
           name: "rules_rust.tar.gz"
           path: ${{ github.workspace }}/.github/rules_rust.tar.gz
           if-no-files-found: error
+      - uses: actions/upload-artifact@v3
+        with:
+          name: "rules_rust_ext.tar.gz"
+          path: ${{ github.workspace }}/.github/rules_rust_ext.tar.gz
+          if-no-files-found: error
       - name: Generate release notes
         run: |
           # Generate the release notes
           sed 's#{version}#${{ env.RELEASE_VERSION }}#g' ${{ github.workspace }}/.github/release_notes.template \
           | sed 's#{sha256_base64}#${{ env.ARCHIVE_SHA256_BASE64 }}#g' \
+          | sed 's#{ext_sha256_base64}#${{ env.ARCHIVE_EXT_SHA256_BASE64 }}#g' \
           > ${{ github.workspace }}/.github/release_notes.txt
       - name: Create release
         uses: softprops/action-gh-release@v1
@@ -169,10 +197,20 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.rules_rust_release.outputs.upload_url }}
-          asset_name: rules_rust-v${{ env.RELEASE_VERSION }}.tar.gz
+          asset_name: rules_rust-${{ env.RELEASE_VERSION }}.tar.gz
           asset_path: ${{ github.workspace }}/.github/rules_rust.tar.gz
           asset_content_type: application/gzip
 
+      - name: "Upload the rules extensions archive"
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.rules_rust_release.outputs.upload_url }}
+          asset_name: rules_rust_ext-${{ env.RELEASE_VERSION }}.tar.gz
+          asset_path: ${{ github.workspace }}/.github/rules_rust_ext.tar.gz
+          asset_content_type: application/gzip
+
       # There must be a upload action for each platform triple we create
       - name: "Upload aarch64-apple-darwin"
         uses: actions/upload-release-asset@v1

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,2 +1,2 @@
 # Just for information
-# * @acmcarther @mfarrugi @damienmg @smklein @dfreese
+# * @uebelandre @illicitonion @scentini @krasimirgg