From 27a36a45ed33a19a1e0f0c2af07935deff7816ea Mon Sep 17 00:00:00 2001 From: javierzazo Date: Thu, 11 Jun 2026 13:10:43 -0700 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20fix:=20devcontainer=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devcontainer/Dockerfile | 1 + README.md | 57 ----------------------------- README.md.jinja | 79 ---------------------------------------- 3 files changed, 1 insertion(+), 136 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 3ea4860..fea344f 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -33,6 +33,7 @@ RUN mkdir -p -m 755 /etc/apt/keyrings \ && arch=$(dpkg --print-architecture) \ && node_version=24.x \ && echo "deb [arch=$arch signed-by=/etc/apt/keyrings/microsoft.gpg] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/azure-cli.list > /dev/null \ + && echo "deb [arch=$arch signed-by=/etc/apt/keyrings/microsoft.gpg] https://packages.microsoft.com/ubuntu/$(lsb_release -rs)/prod $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/microsoft-prod.list > /dev/null \ && echo "deb [arch=$arch signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \ && echo "deb [arch=$arch signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ && echo "deb [arch=$arch signed-by=/etc/apt/keyrings/github_git-lfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/ubuntu/ $(. /etc/os-release && echo "$VERSION_CODENAME") main" | tee /etc/apt/sources.list.d/github_git-lfs.list > /dev/null \ diff --git a/README.md b/README.md index d6914dc..27823e1 100644 --- a/README.md +++ b/README.md @@ -41,63 +41,6 @@ Visit the documentation: :point_right: Go to [new project](https://microsoft.github.io/cookie-doh/getting_started/) for first steps! -## :space_invader: Codespaces - -Learn about [GitHub Codespaces](https://docs.github.com/en/codespaces) and [DevPod](https://devpod.sh/). - -:point_right: Click below to clone or fork this repository automatically and start developing: - -[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/microsoft/cookie-doh) - -[![Open in DevPod!](https://devpod.sh/assets/open-in-devpod.svg)](https://devpod.sh/open#https://github.com/microsoft/cookie-doh) - -## :gear: Devcontainer - -Learn about [Devcontainers](https://containers.dev). -Requires [Docker](https://www.docker.com/get-started/) installed on your local machine. - -:point_right: Follow instructions for [VSCode](https://code.visualstudio.com/docs/devcontainers/tutorial) -and/or [PyCharm](https://www.jetbrains.com/help/pycharm/connect-to-devcontainer.html). - -## :computer: Local development - -:point_right: Follow [instructions](https://microsoft.github.io/cookie-doh/dev_setup) -to set up your local environment. - -## :hammer_and_wrench: Development tools - -Cookie-doh uses and generates projects with the following tools to help the development experience: - -* [uv](https://docs.astral.sh/uv/) for dependency management, virtual environments and -packaging. Configured so that your code is readily importable. -* [ruff](https://docs.astral.sh/ruff/) for formatting and linting: helps you write clean and uniform code across collaborations. -* [pytest](https://docs.pytest.org/en/stable/) for testing: ensures your code is working as expected. -* [pyright](https://github.com/microsoft/pyright) for static annotations: helps identify simple errors and makes your code more readable! -* [codespell](https://github.com/codespell-project/codespell) for spell checking: pinpoints spelling errors across code and documents. -* [CI workflows](https://en.wikipedia.org/wiki/Continuous_integration): automates validation when you submit a PR or merge to `main` branch. - -Optional tools (configurable when you create a new project): - -* [Material for MkDocs](https://squidfunk.github.io/mkdocs-material/) for beautiful markdown documentation builds (like [cookie-doh](https:microsoft.github.io/cookie-doh)'s). -* [pre-commit](https://pre-commit.com/) for quick validation checks and fixes before committing. -* [commitizen](https://commitizen-tools.github.io/commitizen/) -for writing [conventional commits](https://www.conventionalcommits.org/), to help write better commit messages -and track changes through [time](https://github.com/microsoft/cookie-doh/blob/main/CHANGELOG.md). - -## :mountain: Contributing - -This project welcomes contributions and suggestions. Most contributions require you to agree to a -Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us -the rights to use your contribution. For details, visit . - -When you submit a pull request, a CLA bot will automatically determine whether you need to provide -a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions -provided by the bot. You will only need to do this once across all repos using our CLA. - -This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). -For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or -contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. - ## :balance_scale: Trademarks This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft diff --git a/README.md.jinja b/README.md.jinja index 4f5590c..3f80bc7 100644 --- a/README.md.jinja +++ b/README.md.jinja @@ -22,86 +22,7 @@ https://{{ organization }}.github.io/{{ project_name }}/ ## :floppy_disk: Source Code https://github.com/{{ organization }}/{{ project_name }}/ {%- endif %} - - -## :space_invader: Codespaces - -We provide a configured devcontainer for you to use in your new project and/or cookie-doh itself. -You can create a container image with all the necessary dependencies, -and use it for remote development in a remote node with [GitHub Codespaces](https://docs.github.com/en/codespaces) -or [DevPod](https://devpod.sh/). - -:point_right: Click below to clone or fork this repository automatically and start developing: - -[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/{{organization}}/{{project_name}}) - -[![Open in DevPod!](https://devpod.sh/assets/open-in-devpod.svg)](https://devpod.sh/open#https://github.com/{{organization}}/{{project_name}}) - - -## :gear: Devcontainer - -Alternatively, you can build a local container directly and use it in VSCode and/or -PyCharm without developing in a remote node or setting up a local environment. - -Learn about [Devcontainers](https://containers.dev/). -Requires [Docker](https://www.docker.com/get-started/) installed on your local machine. - -:point_right: Follow instructions for [VSCode](https://code.visualstudio.com/docs/devcontainers/tutorial) -and/or [PyCharm](https://www.jetbrains.com/help/pycharm/connect-to-devcontainer.html). - - -## :computer: Local development - -The only required dependency is [uv](https://docs.astral.sh/uv/getting-started/installation/). -However, we recommend installing some extra dependencies to improve the development experience. - -:point_right: Follow [instructions](https://microsoft.github.io/cookie-doh/dev_setup) -to set up your local environment. - - -## :hammer_and_wrench: Description of development tools: - -{{ project_name}} uses the following tools to facilitate the development experience: - -* [uv](https://docs.astral.sh/uv/) for Python management, dependency management, virtual environments and -packaging, i.e., makes your code readily importable! -* [ruff](https://github.com/astral-sh/ruff) for formatting and linting: helps you write clean and uniform code for better consistency (and it's fast!). -* [pytest](https://docs.pytest.org/en/stable/) for testing: ensures your code is working as expected! -* [pyright](https://github.com/microsoft/pyright) for static annotations: helps identify simple errors, but more importantly, -makes your code more readable! -* [codespell](https://github.com/codespell-project/codespell) for spell checking: pinpoints spelling errors across code and documents. -* [CI workflows](https://en.wikipedia.org/wiki/Continuous_integration): automates validation when you submit a PR or merge to `main` branch. -{% if documentation -%} -* [Material for MkDocs](https://squidfunk.github.io/mkdocs-material/) for beautiful markdown documentation builds (like [cookie-doh](https:microsoft.github.io/cookie-doh)'s). -{% endif -%} -{% if precommit -%} -* [pre-commit](https://pre-commit.com/) for quick validation checks and fixes before committing. -{% endif -%} -{% if commitizen -%} -* [commitizen](https://commitizen-tools.github.io/commitizen/) -for writing [conventional commits](https://www.conventionalcommits.org/), to help write better commit messages -and track changes through [time](https://github.com/microsoft/cookie-doh/blob/main/CHANGELOG.md). -{% endif -%} - - {% if organization == 'microsoft' %} --------------------------------------------- - -## :mountain: Contributing - -This project welcomes contributions and suggestions. Most contributions require you to agree to a -Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us -the rights to use your contribution. For details, visit https://cla.opensource.microsoft.com. - -When you submit a pull request, a CLA bot will automatically determine whether you need to provide -a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions -provided by the bot. You will only need to do this once across all repos using our CLA. - -This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). -For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or -contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. - - ## :balance_scale: Trademarks This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft From 7a2819bdefe873d461db4f495a78f4ddce748798 Mon Sep 17 00:00:00 2001 From: javierzazo Date: Thu, 11 Jun 2026 13:33:10 -0700 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20fix:=20hopefully=20fixes=20c?= =?UTF-8?q?i?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main.yml.jinja | 1 + .github/workflows/pr.yml | 1 - .github/workflows/pr.yml.jinja | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml.jinja b/.github/workflows/main.yml.jinja index 7148fe4..784dead 100644 --- a/.github/workflows/main.yml.jinja +++ b/.github/workflows/main.yml.jinja @@ -37,3 +37,4 @@ jobs: contents: read actions: write id-token: write + attestations: write diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ec7a28b..4269d61 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -33,7 +33,6 @@ jobs: actions: write id-token: write attestations: write - id-token: write copier: uses: ./.github/workflows/copier.yml diff --git a/.github/workflows/pr.yml.jinja b/.github/workflows/pr.yml.jinja index 878f8e7..600e0b7 100644 --- a/.github/workflows/pr.yml.jinja +++ b/.github/workflows/pr.yml.jinja @@ -32,3 +32,5 @@ jobs: permissions: contents: read actions: write + id-token: write + attestations: write