[hermes] Move to repository root (#3192)

This allows `.github/workflows/Dockerfile` to avoid copying the Hermes
source into the container when it copies `tools`, which means that
Hermes changes will not force a full container re-build, instead
allowing more layers of the container to be cached in CI.

gherrit-pr-id: Gcc4q572sgyiglnf43z6by36ux4scgqec

Author: joshlf

.dockerignore

@@ -7,7 +7,13 @@
 # This file may not be copied, modified, or distributed except according to
 # those terms.
 
-**/target/
+/target/
+/hermes/target/
 **/.git/
 tools/vendor
 tools/.cargo/
+
+# FIXME: This is just a symlink to `../hermes`, intended to ensure that old
+# links to `tools/hermes` are less confusing since we've moved that directory to
+# `hermes` in the repo root. We should get rid of that symlink at some point.
+tools/hermes/

.github/auto-approvers.json

@@ -1,11 +1,5 @@
 {
-  "tools/hermes/": [
-    "joshlf"
-  ],
-  "tools/Cargo.lock": [
-    "joshlf"
-  ],
-  "tools/vendor/": [
+  "hermes/": [
     "joshlf"
   ],
   ".github/workflows/hermes.yml": [

.github/workflows/Dockerfile

@@ -37,8 +37,6 @@ RUN cargo install cargo-nextest --locked                    && \
 
 WORKDIR /setup
 
-# FIXME: Don't copy `tools/hermes` so that changes there don't invalidate the
-# Docker cache.
 COPY Cargo.toml ./
 COPY cargo.sh   ./
 COPY tools      ./tools

.github/workflows/ci.yml

@@ -611,7 +611,7 @@ jobs:
     # for checking compatibility (rather than the most recent published version),
     # which will make it unnecessary to remove `.cargo/config.toml`.
     - name: Remove Cargo config and vendored dependencies
-      run: rm -rf .cargo/config.toml tools/vendor
+      run: rm -rf .cargo/config.toml tools/vendor hermes/vendor
 
     # Check semver compatibility with the most recently-published version on
     # crates.io. We do this in the matrix rather than in its own job so that it

.github/workflows/hermes.yml

@@ -40,8 +40,8 @@ jobs:
       - name: Build and cache Docker image
         uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5
         with:
-          context: tools
-          file: tools/hermes/Dockerfile
+          context: hermes
+          file: hermes/Dockerfile
           target: base
           load: true
           tags: hermes-ci:local
@@ -53,14 +53,14 @@ jobs:
       # easier to skim (in particular, it's clear at a glance whether a failure
       # is due to unit or integration tests).
       - name: Run unit tests
-        run: docker run --rm -v $GITHUB_WORKSPACE/tools:/workspace hermes-ci:local cargo test --verbose --bin cargo-hermes
+        run: docker run --rm -v $GITHUB_WORKSPACE/hermes:/workspace hermes-ci:local cargo test --verbose --bin cargo-hermes
 
       # We duplicate running unit tests since they're very cheap compared to
       # integration tests, and this way it's easier to be sure that we run all
       # tests instead of specifically trying to carve out unit tests and risk
       # missing test categories.
       - name: Run all tests
-        run: docker run --rm -v $GITHUB_WORKSPACE/tools:/workspace hermes-ci:local cargo test --verbose
+        run: docker run --rm -v $GITHUB_WORKSPACE/hermes:/workspace hermes-ci:local cargo test --verbose
 
   # Used to signal to branch protections that all other jobs have succeeded.
   all-jobs-succeed:

.gitignore

@@ -17,3 +17,4 @@ lcov.info
 # previous rules)
 !vendor/**
 !tools/vendor/**
+!hermes/vendor/**

ci/check_fmt.sh

@@ -16,5 +16,18 @@ else
     FMT_FLAGS="--check"
 fi
 
-find . -iname '*.rs' -type f -not -path './target/*' -not -iname '*.expected.rs' -not -path './vendor/*' -not -path './tools/vendor/*' -not -path './tools/hermes/*' -print0 | xargs -0 --no-run-if-empty ./cargo.sh +nightly fmt $FMT_FLAGS -- >&2
-find ./tools/hermes -iname '*.rs' -type f -not -path './tools/hermes/target/*' -not -iname '*.expected.rs' -not -path './tools/hermes/tests/fixtures/*' -not -path './tools/hermes/tests/ui/*' -print0 | xargs -0 --no-run-if-empty ./cargo.sh +nightly fmt $FMT_FLAGS --manifest-path tools/hermes/Cargo.toml -- >&2
+find . -iname '*.rs' -type f       \
+    -not -path './hermes/*'        \
+    -not -path './target/*'        \
+    -not -path './tools/target/*'  \
+    -not -iname '*.expected.rs'    \
+    -not -path './vendor/*'        \
+    -not -path './tools/vendor/*'  \
+    -print0 | xargs -0 --no-run-if-empty ./cargo.sh +nightly fmt $FMT_FLAGS -- >&2
+
+find ./hermes -iname '*.rs' -type f        \
+    -not -path './hermes/target/*'         \
+    -not -path './hermes/vendor/*'         \
+    -not -path './hermes/tests/fixtures/*' \
+    -not -path './hermes/tests/ui/*'       \
+    -print0 | xargs -0 --no-run-if-empty ./cargo.sh +nightly fmt $FMT_FLAGS --manifest-path hermes/Cargo.toml -- >&2

hermes/.cargo/config.toml

@@ -0,0 +1,8 @@
+[env]
+__ZEROCOPY_LOCAL_DEV = "1"
+
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"