From 79952c769f8dc010f1910661643308475a650523 Mon Sep 17 00:00:00 2001 From: Michi Mutsuzaki Date: Fri, 16 Aug 2024 11:42:48 +0000 Subject: [PATCH] Unlock the repo https://github.com/cilium/cilium/pull/34178 got merged. Remove the lock workflow and update CONTRIBUTING.md. Signed-off-by: Michi Mutsuzaki --- .github/workflows/lock.yaml | 15 --------------- CONTRIBUTING.md | 21 +++++++++------------ 2 files changed, 9 insertions(+), 27 deletions(-) delete mode 100644 .github/workflows/lock.yaml diff --git a/.github/workflows/lock.yaml b/.github/workflows/lock.yaml deleted file mode 100644 index f387234f90..0000000000 --- a/.github/workflows/lock.yaml +++ /dev/null @@ -1,15 +0,0 @@ -name: Lock cilium-cli repo - -on: - pull_request: {} - -jobs: - lock: - name: Lock cilium-cli repo - runs-on: ubuntu-22.04 - steps: - - name: Lock - run: | - echo "cilium-cli repo is being merged to cilium/cilium repo." - echo "If you have questions, post a message in #development Cilium slack channel." - exit 1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0f6a76e2f9..1e09bdc43e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,19 +1,12 @@ # Contributing to Cilium CLI -## IMPORTANT Cilium CLI is moving 🚚📦📦📦 - -We are planning to merge Cilium CLI code into cilium/cilium repository to -simplify the overall development process after Cilium v1.16.0 gets released. -See [CFP-25694](https://github.com/cilium/design-cfps/pull/9) for details. -If you have questions, post a message in -[#development Cilium Slack channel](https://cilium.slack.com/archives/C2B917YHE). - ## Contribution workflow -Cilium CLI uses GitHub for collaborative development. Please use GitHub issues -to discuss proposals and use pull requests to suggest changes. For more -information see the [Cilium Development -Guide](https://docs.cilium.io/en/latest/contributing/development/). +Cilium CLI uses GitHub for collaborative development. This repository only hosts +release artifacts for Cilium CLI. The actual code for Cilium CLI is in +[Cilium GitHub repository] under [`cilium-cli/` directory]. Please use GitHub +issues to discuss proposals and use pull requests to suggest changes in +[Cilium GitHub repository]. For more information see the [Development Guide]. ## Slack @@ -28,3 +21,7 @@ Conduct](https://github.com/cilium/cilium/blob/main/CODE_OF_CONDUCT.md). Only by respecting each other can we develop a productive, collaborative community. If you would like to report a violation of the code of contact, please contact any of the maintainers or our mediator, Beatriz Martinez . + +[`cilium-cli/` directory]: https://github.com/cilium/cilium/tree/main/cilium-cli +[Cilium GitHub repository]: https://github.com/cilium/cilium +[Development Guide]: https://docs.cilium.io/en/latest/contributing/development/