Skip to content

Commit 69feb52

Browse files
author
bakebot
committed
Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool
Template: ``` { "template": "https://github.com/networktocode-llc/cookiecutter-ntc.git", "dir": "python", "ref": "main", "path": "/__w/cookiecutter-nautobot-app-drift-manager/cookiecutter-nautobot-app-drift-manager/cookiecutter-ntc/python" } ``` Cookie: ``` { "remote": "https://github.com/networktocode/diffsync.git", "path": "/tmp/tmpn08h9047/diffsync", "repository_path": "/tmp/tmpn08h9047/diffsync", "dir": "", "branch_prefix": "drift-manager/develop", "context": { "codeowner_github_usernames": "@glennmatthews @michalis1 @jdrew82", "full_name": "Network to Code, LLC", "email": "info@networktocode.com", "github_org": "networktocode", "description": "Library to easily sync/diff/update 2 different data sources", "project_name": "diffsync", "project_slug": "diffsync", "repo_url": "https://github.com/networktocode/diffsync", "base_url": "diffsync", "project_python_name": "diffsync", "project_python_base_version": "3.10", "project_with_config_settings": "no", "generate_docs": "yes", "version": "2.2.0", "original_publish_year": "2025", "_template": "/__w/cookiecutter-nautobot-app-drift-manager/cookiecutter-nautobot-app-drift-manager/cookiecutter-ntc/python", "_output_dir": "/tmp/tmpn08h9047", "_repo_dir": "/__w/cookiecutter-nautobot-app-drift-manager/cookiecutter-nautobot-app-drift-manager/cookiecutter-ntc/python", "_checkout": null }, "drift_managed_branch": "develop", "remote_name": "origin", "pull_request_strategy": "PullRequestStrategy.UPDATE_OR_CREATE", "post_actions": [], "baked_commit_ref": "bc789d65fa90182c0eb392664e1cba02ea187ab1", "draft": false } ``` CLI Arguments: ``` { "cookie_dir": "", "input": false, "json_filename": "", "output_dir": "", "push": true, "template": "./cookiecutter-ntc", "template_dir": "python", "template_ref": "main", "pull_request": "update-or-create", "post_action": [], "disable_post_actions": true, "draft": null, "drift_managed_branch": "develop" } ```
1 parent 5780050 commit 69feb52

File tree

4 files changed

+28
-2
lines changed

4 files changed

+28
-2
lines changed

.cookiecutter.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@
1616
"version": "2.2.0",
1717
"original_publish_year": "2025",
1818
"_drift_manager": {
19-
"template": "git@github.com:networktocode-llc/cookiecutter-ntc.git",
19+
"template": "https://github.com/networktocode-llc/cookiecutter-ntc.git",
2020
"template_dir": "python",
2121
"template_ref": "main",
2222
"cookie_dir": "",
23-
"pull_request_strategy": "create",
23+
"pull_request_strategy": "update-or-create",
2424
"post_actions": [],
2525
"draft": false,
26+
<<<<<<< HEAD
2627
"baked_commit_ref": "bc789d65fa90182c0eb392664e1cba02ea187ab1",
28+
=======
29+
"baked_commit_ref": "67d15ddeb638efb7c39ab746e97e7b9c96c16801",
30+
>>>>>>> 4a41aa1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
2731
"drift_managed_branch": "develop"
2832
}
2933
}

.github/workflows/release.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ jobs:
1717
poetry-version: "2.1.3"
1818
python-version: "3.13"
1919
poetry-install-options: "--no-root"
20+
<<<<<<< HEAD
2021
- name: "Build Documentation"
2122
run: "poetry run invoke build build-and-check-docs"
23+
=======
24+
>>>>>>> 4a41aa1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
2225
- name: "Run Poetry Build"
2326
run: "poetry build"
2427

@@ -58,17 +61,31 @@ jobs:
5861
if: "startsWith(github.ref, 'refs/tags/v')"
5962
needs: "build"
6063
environment: "pypi"
64+
<<<<<<< HEAD
65+
=======
66+
# Steps to publish to PyPI.
67+
>>>>>>> 4a41aa1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
6168
steps:
6269
- name: "Retrieve built package from cache"
6370
uses: "actions/download-artifact@v4"
6471
with:
6572
name: "distfiles"
6673
path: "dist/"
74+
<<<<<<< HEAD
6775
- name: "Publish package distribution to PyPI"
6876
uses: "pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e" # v1.13.0
6977
with:
7078
user: "__token__"
7179
password: "${{ secrets.PYPI_API_TOKEN }}"
80+
=======
81+
- name: "Publish package distributions to PyPI"
82+
uses: "pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e" # v1.13.0
83+
## Used for networktocode org since trusted publisher isn't supported for GitHub Plan.
84+
with:
85+
user: "__token__"
86+
password: "${{ secrets.PYPI_API_TOKEN }}"
87+
# End publish to PyPI job.
88+
>>>>>>> 4a41aa1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
7289

7390
slack-notify:
7491
needs:

changes/+main.housekeeping

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Rebaked from the cookie `main`.

docs/admin/release_notes/version_1.0.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ This document describes all new features and changes in the release. The format
66

77
Initial release of DiffSync.
88

9+
<<<<<<< HEAD
910
## [v1.0.0] - 2020-10-23
11+
=======
12+
## [v1.0.0] - 2026-01-13
13+
>>>>>>> 4a41aa1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
1014
1115
Initial release

0 commit comments

Comments
 (0)