From 0ada23e20082cac7fe082efd6c5dea78e3362d1c Mon Sep 17 00:00:00 2001
From: Ian Leitch <ian@leitch.io>
Date: Fri, 23 Aug 2024 16:27:03 +0200
Subject: [PATCH] Include Bazel files in release archive

---
 BUILD.bazel                                     | 13 +++++++++++++
 MODULE.bazel.lock                               |  2 +-
 Sources/ProjectDrivers/BazelProjectDriver.swift |  6 +++---
 bazel/BUILD.bazel                               | 13 -------------
 bazel/{internal => scan}/BUILD.bazel            |  0
 bazel/{internal => scan}/scan.bzl               |  2 +-
 bazel/{internal => scan}/scan_template.sh       |  0
 scripts/release                                 |  9 ++++++---
 8 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 BUILD.bazel
 rename bazel/{internal => scan}/BUILD.bazel (100%)
 rename bazel/{internal => scan}/scan.bzl (99%)
 rename bazel/{internal => scan}/scan_template.sh (100%)

diff --git a/BUILD.bazel b/BUILD.bazel
new file mode 100644
index 0000000000..8b4fc0750d
--- /dev/null
+++ b/BUILD.bazel
@@ -0,0 +1,13 @@
+package_group(
+    name = "generated",
+    includes = [
+      "@periphery_generated//:package_group"
+    ],
+)
+
+package_group(
+    name = "package_group",
+    packages = ["//..."],
+)
+
+alias(actual = "@periphery_generated//rule:scan", name = "scan")
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index 56feefd00b..d62726ff7e 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -76,7 +76,7 @@
   "moduleExtensions": {
     "//bazel:extensions.bzl%generated": {
       "general": {
-        "bzlTransitiveDigest": "kOEf2G+VuW7R207nDIUewqU0dUnnzU7fIydMwugrwTQ=",
+        "bzlTransitiveDigest": "xZGh+e0CeHqMg70Vh0voNCEZWSMobpYB+Rt98Fb2pdg=",
         "usagesDigest": "+tLn28VxrYHSJkd4sij6ZCqx9LBk8tiEaJEOx9zRbFY=",
         "recordedFileInputs": {},
         "recordedDirentsInputs": {},
diff --git a/Sources/ProjectDrivers/BazelProjectDriver.swift b/Sources/ProjectDrivers/BazelProjectDriver.swift
index 1eb3751996..f9e751bde6 100644
--- a/Sources/ProjectDrivers/BazelProjectDriver.swift
+++ b/Sources/ProjectDrivers/BazelProjectDriver.swift
@@ -94,7 +94,7 @@ public class BazelProjectDriver: ProjectDriver {
         let buildPath = outputPath.appending("BUILD.bazel")
         let deps = try queryTargets().joined(separator: ",\n")
         let buildFileContents = """
-        load("@periphery//bazel/internal:scan.bzl", "scan")
+        load("@periphery//bazel/scan:scan.bzl", "scan")
 
         scan(
           name = "scan",
@@ -102,7 +102,7 @@ public class BazelProjectDriver: ProjectDriver {
           config = "\(configPath)",
           periphery_binary = "\(executablePath)",
           visibility = [
-            "@periphery//bazel:package_group"
+            "@periphery//:package_group"
           ],
           deps = [
             \(deps)
@@ -123,7 +123,7 @@ public class BazelProjectDriver: ProjectDriver {
             "run",
             "--check_visibility=false",
             "--ui_event_filters=-info,-debug,-warning",
-            "@periphery//bazel:scan",
+            "@periphery//:scan",
         ])
 
         // The actual scan is performed by Bazel.
diff --git a/bazel/BUILD.bazel b/bazel/BUILD.bazel
index 8b4fc0750d..e69de29bb2 100644
--- a/bazel/BUILD.bazel
+++ b/bazel/BUILD.bazel
@@ -1,13 +0,0 @@
-package_group(
-    name = "generated",
-    includes = [
-      "@periphery_generated//:package_group"
-    ],
-)
-
-package_group(
-    name = "package_group",
-    packages = ["//..."],
-)
-
-alias(actual = "@periphery_generated//rule:scan", name = "scan")
diff --git a/bazel/internal/BUILD.bazel b/bazel/scan/BUILD.bazel
similarity index 100%
rename from bazel/internal/BUILD.bazel
rename to bazel/scan/BUILD.bazel
diff --git a/bazel/internal/scan.bzl b/bazel/scan/scan.bzl
similarity index 99%
rename from bazel/internal/scan.bzl
rename to bazel/scan/scan.bzl
index 3dad901d70..5b39153671 100644
--- a/bazel/internal/scan.bzl
+++ b/bazel/scan/scan.bzl
@@ -202,7 +202,7 @@ scan = rule(
         "periphery_binary": attr.string(doc = "Path to the periphery binary."),
         "_template": attr.label(
             allow_single_file = True,
-            default = "@periphery//bazel/internal:scan_template.sh",
+            default = "@periphery//bazel/scan:scan_template.sh",
         ),
     },
     outputs = {
diff --git a/bazel/internal/scan_template.sh b/bazel/scan/scan_template.sh
similarity index 100%
rename from bazel/internal/scan_template.sh
rename to bazel/scan/scan_template.sh
diff --git a/scripts/release b/scripts/release
index 361a7f5c00..cca4e05dc3 100755
--- a/scripts/release
+++ b/scripts/release
@@ -41,6 +41,11 @@ mkdir .release
 cat scripts/Version.swift.template | sed s/__VERSION__/${version}/ > Sources/Frontend/Version.swift
 cat scripts/artifactbundle_info.json.template | sed s/__VERSION__/${version}/ > .release/info.json
 
+cp LICENSE.md .release/
+cp scripts/release_notes.md.template .release/release_notes.md
+cp BUILD.bazel MODULE.bazel .release
+cp -R bazel .release
+
 echo -e "\nUpdate CHANGELOG.md"
 confirm "Continue?"
 
@@ -48,8 +53,6 @@ bin_path=$(make show_bin_path)
 rm -rf "$bin_path"
 make build_release
 cp "$bin_path" .release/
-cp LICENSE.md .release/
-cp scripts/release_notes.md.template .release/release_notes.md
 
 # Codesign
 cd .release
@@ -101,7 +104,7 @@ if [[ $version == *"beta"* ]]; then
 fi
 
 cd ..
-gh release create "--latest=${is_latest}" -F .release/release_notes.md "${version}" ".release/${zip_filename}" ".release/${zip_artifactbundle}"
+gh release create --latest="${is_latest}" -F .release/release_notes.md "${version}" ".release/${zip_filename}" ".release/${zip_artifactbundle}"
 
 # Homebrew
 if [ $is_latest = false ]; then