rs: Make the repo root the workspace

The separation into `libs/` and `tools/` turns out not to be very
useful at all, so we start moving the workspace and crates one level
up.

.github/workflows/release.yml

@@ -124,6 +124,7 @@ jobs:
           # Actually do builds and make zips and whatnot
           cargo dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
           echo "cargo dist ran successfully"
+          cat dist-manifest.json
       - id: cargo-dist
         name: Post-build
         # We force bash here just because github makes it really hard to get values up

.gitignore

@@ -5,15 +5,16 @@ device-key.pem
 hsm_secret
 *.so
 .coverage
-libs/Cargo.lock
 *~
 site
 .DS_Store
+target
+Cargo.lock
 
 # These files are auto generated and may contain sensible data that
 # we do not want to check-in!
 tls/users-nobody-key.pem
 tls/users-nobody.pem
 .coverage.*
 .python-version
-docs/.cache
+docs/.cache

libs/Cargo.toml → Cargo.toml

@@ -12,10 +12,10 @@ lto = "thin"
 [workspace]
 resolver = "2"
 members = [
-  "gl-client",
-  "gl-client-py",
-  "gl-plugin",
-  "gl-signerproxy",
+  "libs/gl-client",
+  "libs/gl-client-py",
+  "libs/gl-plugin",
+  "libs/gl-signerproxy",
 ]
 
 [workspace.dependencies]

Makefile

@@ -58,7 +58,7 @@ clean: clean-rs
 gen: ${GENALL}
 
 build-self: ensure-docker
-	(cd libs; cargo build --all)
+	cargo build --all
 	(cd libs/gl-client-py && python3 -m maturin develop)
 	pip install -e libs/gl-testing
 

libs/gl-testing/Dockerfile

@@ -69,8 +69,8 @@ RUN cd /repo/libs/gl-plugin && cargo build --release && \
 # the binaries and we switch from release to debug, simply to keep the
 # docker image size in check
 RUN mkdir -p /tmp/target/debug && \
-    mv /repo/libs/target/release/gl-plugin /tmp/target/debug/ && \
-    mv /repo/libs/target/release/gl-signerproxy /tmp/target/debug/
+    mv /repo/target/release/gl-plugin /tmp/target/debug/ && \
+    mv /repo/target/release/gl-signerproxy /tmp/target/debug/
 
 FROM ubuntu:20.04 as tester
 ARG BITCOIN_VERSION=25.0