Add a bazel build (#23)

So that we can create a xar archive of the whole stuff that is self
contained

Author: mpatou

.github/workflows/ci.yml

@@ -9,6 +9,32 @@ on:
     types: [opened, synchronize, edited, ready_for_review]
 
 jobs:
+  ci_bazel:
+    name: bazel build linux
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '>=1.20.0'
+      - uses: actions/[email protected]
+        with:
+          python-version: '3.10'
+      - run: curl -L -o bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64
+      - run: chmod a+x bazelisk
+      - run: ln -s bazelisk bazel
+      - run: pip install xar
+      - run: sudo apt-get install squashfs-tools
+      - id: bazel_build
+        run: bazel build //:stacky.xar && bazel build //:stacky --build_python_zip
+      - name: Persist build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: stacky_draft
+          path: |
+            bazel-bin/stacky
+            bazel-bin/stacky.xar
+          retention-days: 2
 
   ci:
     name: build and archive
@@ -18,7 +44,7 @@ jobs:
       - uses: actions/[email protected]
         with:
           python-version: '3.10'
-      - id: build
+      - id: python_wheel_build
         uses: OpenAstronomy/build-python-dist@v1
         with:
           pure_python_wheel: true
@@ -30,7 +56,6 @@ jobs:
             dist/*.whl
           retention-days: 2
 
-
   linter:
     name: runner / black formatter
     runs-on: ubuntu-latest
@@ -51,4 +76,3 @@ jobs:
           python-version: '3.10'
       - run: pip install asciitree ansicolors simple-term-menu mypy
       - run: mypy ./src/stacky/stacky.py
-

.github/workflows/release.yml

@@ -24,9 +24,8 @@ jobs:
         with:
           pure_python_wheel: true
 
-
       - name: Store the distribution packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: python-package-distributions
           path: dist/
@@ -53,18 +52,50 @@ jobs:
     - name: Publish distribution 📦  to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
 
+  bazel_build:
+    name: bazel build linux
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '>=1.20.0'
+      - uses: actions/[email protected]
+        with:
+          python-version: '3.10'
+      - run: curl -L -o bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64
+      - run: chmod a+x bazelisk
+      - run: ln -s bazelisk bazel
+      - run: pip install xar
+      - run: sudo apt-get install squashfs-tools
+      - id: bazel_build
+        run: bazel build //:stacky.xar && bazel build //:stacky --build_python_zip
+      - name: Persist build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: stacky_bazel
+          path: |
+            bazel-bin/stacky.xar
+            bazel-bin/stacky
+          retention-days: 2
   github_release:
     name: >-
       Sign the Python 🐍 distribution 📦 with Sigstore
       and upload them to GitHub Release
     needs:
       - publish-to-pypi
+      - bazel_build
     runs-on: ubuntu-latest
 
     permissions:
       contents: write  # IMPORTANT: mandatory for making GitHub Releases
       id-token: write  # IMPORTANT: mandatory for sigstore
     steps:
+      - name: Download all the bazel
+        uses: actions/download-artifact@v3
+        with:
+          name: stacky_bazel
+          path: dist/
       - name: Download all the dists
         uses: actions/download-artifact@v3
         with:
@@ -77,6 +108,8 @@ jobs:
           inputs: >-
             ./dist/*.tar.gz
             ./dist/*.whl
+            ./dist/stacky
+            ./dist/stacky.xar
       - name: Release
         uses: softprops/action-gh-release@v1
         with:

.gitignore

@@ -3,3 +3,5 @@ rockset_stacky.egg-info/
 src/rockset_stacky.egg-info/
 build/
 src/stacky/__pycache__
+
+bazel-*

BUILD.bazel

@@ -0,0 +1,29 @@
+load("@rules_xar//:xarify.bzl", "py_binary_xar")
+load("@rules_python//python/pip_install:requirements.bzl", "compile_pip_requirements")
+load("@pypi//:requirements.bzl", "requirement")
+
+py_binary_xar(
+    name = "stacky.xar",
+    main = ":stacky",
+)
+
+
+py_binary(
+    name = "stacky",
+    srcs = ["src/stacky/stacky.py"],
+    main = "src/stacky/stacky.py",
+    deps = [
+        requirement("ansicolors"),
+        requirement("simple-term-menu"),
+        requirement("asciitree"),
+    ]
+)
+
+exports_files(["requirements.txt"])
+
+# Update dependencies with:
+# bazel run //:requirements.update
+compile_pip_requirements(
+    name = "requirements",
+    requirements_txt = "requirements_lock.txt",
+)

README.md

@@ -2,6 +2,14 @@
 
 
 ## Installation
+You now have the choice on how to do that, we build pre-packaged version of stacky on new releases, they can be found on the [releases](https://github.com/rockset/stacky/releases) page and we also publish a package in `pypi`.
+
+### Pre-packaged
+
+Using `bazel` we provide pre-packaged version, they are self contained and don't require the installation of external modules. Just drop them in a directory that is part of the `$PATH` environment variable make it executable and you are good to go.
+
+There is also a [xar](https://github.com/facebookincubator/xar/) version it should be faster to run but requires to have `xarexec_fuse` installed.
+
 ### Pip
 ```
 pip3 install rockset-stacky
@@ -146,5 +154,26 @@ $> stacky commit -m "updated new file"
 - Will sync branch change_part_2 on top of change_part_1
 ```
 
+## Tuning
+
+The behavior of `stacky` allow some tuning. You can tune it by creating a `.stackyconfig`
+the file has to be either at the top of your repository (ie. next to the `.git` folder) or in the `$HOME` folder.
+
+If both files exists the one in the home folder takes precedence.
+The format of that file is following the `ini` format and has the same structure as the `.gitconfig` file.
+
+In the file you have sections and each sections define some parameters.
+
+We currently have the following sections:
+ * UI
+
+List of parameters for each sections:
+
+### UI
+ * skip_confirm, boolean with a default value of `False`, set it to `True` to skip confirmation before doing things like reparenting or removing merged branches.
+ * change_to_main: boolean with a default value of `False`, by default `stacky` will stop doing action is you are not in a valid stack (ie. a branch that was created or adopted by stacky), when set to `True` `stacky` will first change to `main` or `master` *when* the current branch is not a valid stack.
+ * change_to_adopted: boolean with a default value of `False`, when set to `True` `stacky` will change the current branch to the adopted one.
+ * share_ssh_session: boolean with a default value of `False`, when set to `True` `stacky` will create a shared `ssh` session to the `github.com` server. This is useful when you are pushing a stack of diff and you have some kind of 2FA on your ssh key like the ed25519-sk.
+
 ## License
 - [MIT License](https://github.com/rockset/stacky/blob/master/LICENSE.txt)

WORKSPACE

@@ -0,0 +1,46 @@
+workspace(name = "rs_stacky")
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
+http_archive(
+    name = "rules_xar",
+    sha256 = "77d0ed7c5a8219e42a3197e5a20fddc9795191cf595628cf64a842255fbb7d4d",
+    strip_prefix = "rules_xar-0.0.4",
+    url = "https://github.com/ekacnet/rules_xar/archive/refs/tags/v0.0.4.zip",
+)
+
+#####################
+# PYTHON SUPPORT
+#####################
+RULES_PYTHON_VERSION = "0.26.0"
+
+http_archive(
+    name = "rules_python",
+    sha256 = "9d04041ac92a0985e344235f5d946f71ac543f1b1565f2cdbc9a2aaee8adf55b",
+    strip_prefix = "rules_python-{}".format(RULES_PYTHON_VERSION),
+    url = "https://github.com/bazelbuild/rules_python/releases/download/{}/rules_python-{}.tar.gz".format(RULES_PYTHON_VERSION, RULES_PYTHON_VERSION),
+)
+
+load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
+
+# Required to prevent errors about @rules_python_internal missing
+py_repositories()
+
+python_register_toolchains(
+    name = "python3_10",
+    # Available versions are listed in @rules_python//python:versions.bzl.
+    # We recommend using the same version your team is already standardized on.
+    python_version = "3.10",
+)
+
+load("@python3_10//:defs.bzl", "interpreter")
+load("@rules_python//python:pip.bzl", "pip_parse")
+
+pip_parse(
+    name = "pypi",
+    python_interpreter_target = interpreter,
+    requirements_lock = "//:requirements_lock.txt",
+)
+
+load("@pypi//:requirements.bzl", "install_deps")
+
+install_deps()

requirements.in

@@ -0,0 +1 @@
+src/rockset_stacky.egg-info/requires.txt

requirements_lock.txt

@@ -0,0 +1,17 @@
+#
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
+#
+#    bazel run //:requirements.update
+#
+ansicolors==1.1.8 \
+    --hash=sha256:00d2dde5a675579325902536738dd27e4fac1fd68f773fe36c21044eb559e187 \
+    --hash=sha256:99f94f5e3348a0bcd43c82e5fc4414013ccc19d70bd939ad71e0133ce9c372e0
+    # via -r requirements.in
+asciitree==0.3.3 \
+    --hash=sha256:4aa4b9b649f85e3fcb343363d97564aa1fb62e249677f2e18a96765145cc0f6e
+    # via -r requirements.in
+simple-term-menu==1.6.4 \
+    --hash=sha256:5edc5e239060a780d089b6a079f113aeda6dbf91740327c2c70c541ea3a04b8d \
+    --hash=sha256:be9c5dbd8df12a404b14cd8e95d6fc02d58c60e2555f65ddde41777c487fb3b9
+    # via -r requirements.in

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name="rockset-stacky",
-    version="1.0.12",
+    version="1.0.13",
     description="""
     stacky is a tool to manage stacks of PRs. This allows developers to easily 
     manage many smaller, more targeted PRs that depend on each other.