Test copybara import PR

.buildkite/scripts/copy.bara.sky

@@ -0,0 +1,64 @@
+# This is a configuration file for Copybara that defines the workflow for syncing changes between the OSS and monorepo.
+
+MONOREPO_URL = "[email protected]:squareup/cash-server.git"
+OSS_REPO_URL = "[email protected]:cashapp/misk.git"
+
+MONOREPO_BRANCH = "raine/misk-copybara" #main
+OSS_REPO_BRANCH = "raine/copybara-test" #master
+
+MONOREPO_INCLUDES = ["misk/**"]
+MONOREPO_EXCLUDES = ["misk/copy.bara.sky", "misk/.buildkite/*"]
+
+OSS_REPO_INCLUDES = ["**"]
+OSS_REPO_EXCLUDES = []
+
+transforms = [
+    core.move("", "misk", glob(["**"])),
+]
+
+author = authoring.pass_thru("CashApp Copybara <[email protected]>")
+
+# Push changes from the monorepo to the OSS repo
+core.workflow(
+    name = "push",
+    origin = git.origin(
+        url = MONOREPO_URL,
+        ref = MONOREPO_BRANCH,
+    ),
+    origin_files = glob(MONOREPO_INCLUDES, exclude = MONOREPO_EXCLUDES),
+
+    destination = git.destination(
+        url = OSS_REPO_URL,
+        push = OSS_REPO_BRANCH,
+    ),
+    destination_files = glob(OSS_REPO_INCLUDES, exclude = OSS_REPO_EXCLUDES),
+    mode = "ITERATIVE",
+    authoring = author,
+    transformations = [
+        metadata.restore_author("ORIGINAL_AUTHOR", search_all_changes = True),
+        #used when a PR is created in the OSS and we want to do a fake-merge
+        metadata.expose_label("COPYBARA_INTEGRATE_REVIEW"),
+    ] + core.reverse(transforms),
+)
+
+# Pull changes from the OSS to the monorepo (This is just for reference, the SoT is the monorepo)
+core.workflow(
+    name = "pull",
+    origin = git.origin(
+        url = OSS_REPO_URL,
+        ref = OSS_REPO_BRANCH,
+    ),
+    origin_files = glob(OSS_REPO_INCLUDES, exclude = OSS_REPO_EXCLUDES),
+
+    destination = git.destination(
+        url = MONOREPO_URL,
+        push = MONOREPO_BRANCH,
+    ),
+    destination_files = glob(MONOREPO_INCLUDES, exclude = MONOREPO_EXCLUDES),
+    mode = "ITERATIVE",
+    authoring = author,
+    transformations = [
+        metadata.restore_author("ORIGINAL_AUTHOR", search_all_changes = True),
+        metadata.expose_label("COPYBARA_INTEGRATE_REVIEW"),
+    ] + transforms,
+)

.buildkite/scripts/run_copybara

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -eo pipefail
+
+# Check if the workflow name is provided
+if [ "$#" -lt 1 ]; then
+    echo "Usage: $0 <run_copybara workflow_name>"
+    exit 1
+fi
+
+WORKFLOW=$1
+echo "Running Copybara migration $WORKFLOW"
+../bin/copybara .buildkite/scripts/copy.bara.sky $WORKFLOW --git-committer-name Copybara \
+--git-committer-email [email protected]
+
+# Check the exit status
+status=$?
+if [ $status -eq 4 ]; then
+  echo "Copybara finished without changes made to the OSS repository."
+  exit 0
+elif [ $status -ne 0 ]; then
+  echo "Copybara failed with status $status."
+  exit $status
+else
+  echo "Copybara migration successful."
+  exit 0
+fi

.github/workflows/Build.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - master
+      - raine/copybara-test
     paths-ignore:
       - "docs/**"
       - "*.md"

CONTRIBUTING.md

@@ -23,7 +23,7 @@ misk-hibernate tests expect a mysql server running on `localhost:3306` with no p
 the root user. You might stand up a server with a docker image, e.g.
 
 ```shell
-docker run -d --rm --name "mysql-57" -p 3306:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=true -e MYSQL_LOG_CONSOLE=true mysql:5.7 --sql-mode=""
+docker run -d --rm --name "mysql-57" -p 3306:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=true -e MYSQL_LOG_CONSOLE=true mysql:8.0.36 --sql-mode=""
 ```
 
 Misk may download these Docker images as part of its tests. Because tests can time out, pre-downloading these can help resolve timeouts.

README.md

@@ -12,6 +12,7 @@
     * [Getting Started](./docs/getting-started.md)
     * [Developer Guide](./docs/developer-guide.md)
 
+
 * Related
     * [misk-web][miskweb]: a now deprecated React framework used for the Misk Admin Dashboard v1
     * [wisp](./wisp/README.md): some Misk artifacts that are published without use of the Guice Direct Injection library