From e2017d2c9cf73cd0bf6135f74b8e9d226efb397d Mon Sep 17 00:00:00 2001
From: Ryan Northey <ryan@synca.io>
Date: Thu, 15 Aug 2024 11:12:03 +0100
Subject: [PATCH] bazel: Add `@envoy_repo`

Signed-off-by: Ryan Northey <ryan@synca.io>
---
 .github/workflows/envoy.yml | 24 ++++++++++++++++++++++++
 WORKSPACE                   | 10 +++++++---
 deps_extra.bzl              |  6 ++++++
 setup_extra.bzl             |  6 ++++++
 toolchains.bzl              | 11 ++++++-----
 5 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/envoy.yml
 create mode 100644 deps_extra.bzl
 create mode 100644 setup_extra.bzl

diff --git a/.github/workflows/envoy.yml b/.github/workflows/envoy.yml
new file mode 100644
index 0000000..b985e63
--- /dev/null
+++ b/.github/workflows/envoy.yml
@@ -0,0 +1,24 @@
+name: Envoy
+
+permissions:
+  contents: read
+
+on:
+  pull_request:
+  push:
+    branches:
+    - main
+
+concurrency:
+  group: >-
+    ${{ github.event.inputs.head_ref || github.run_id }}
+
+
+jobs:
+  aptly:
+    runs-on: ubuntu-24.04
+    if: github.repository_owner == 'envoyproxy'
+    steps:
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332  # v4.1.7
+    - run: |
+        bazel build --config=ci @envoy_repo//:project | jq '.'
diff --git a/WORKSPACE b/WORKSPACE
index c97e90d..c8c65b7 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -11,9 +11,13 @@ load("//:setup.bzl", "setup")
 setup()
 
 load("//:toolchains.bzl", "toolchains")
-toolchains()
+toolchains(VERSIONS)
+
+load("//:setup_extra.bzl", "setup_extra")
+setup_extra()
+
+load("//:deps_extra.bzl", "dependencies_extra")
+dependencies_extra()
 
-load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
 # gazelle:repo bazel_gazelle
 # gazelle:repository_macro deps-go.bzl%go_dependencies
-gazelle_dependencies(go_repository_default_config = "//:WORKSPACE")
diff --git a/deps_extra.bzl b/deps_extra.bzl
new file mode 100644
index 0000000..ad44759
--- /dev/null
+++ b/deps_extra.bzl
@@ -0,0 +1,6 @@
+load("@base_pip3//:requirements.bzl", pip_dependencies = "install_deps")
+load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
+
+def dependencies_extra():
+    pip_dependencies()
+    gazelle_dependencies(go_repository_default_config = "//:WORKSPACE")
diff --git a/setup_extra.bzl b/setup_extra.bzl
new file mode 100644
index 0000000..fcbd224
--- /dev/null
+++ b/setup_extra.bzl
@@ -0,0 +1,6 @@
+load("@envoy//bazel:python_dependencies.bzl", "envoy_python_dependencies")
+load("@envoy//bazel:repo.bzl", "envoy_repo")
+
+def setup_extra():
+    envoy_python_dependencies()
+    envoy_repo()
diff --git a/toolchains.bzl b/toolchains.bzl
index 700c478..9431b49 100644
--- a/toolchains.bzl
+++ b/toolchains.bzl
@@ -2,12 +2,13 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains")
 load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
 load("@rules_python//python:repositories.bzl", "python_register_toolchains")
 
-def toolchains():
+def _python_minor_version(python_version):
+    return "_".join(python_version.split(".")[:2])
+
+def toolchains(versions):
     python_register_toolchains(
-        name = "python3_12",
-        # 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.12",
+        name = "python%s" % _python_minor_version(versions["python"]),
+        python_version = versions["python"],
     )
     rules_proto_toolchains()
     go_register_toolchains(version = "1.22.4")