Skip to content

Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdrew82 merged 2 commits into from
Jan 13, 2026
Merged

Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool #330

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69feb52
Cookie updated targeting develop by NetworkToCode Cookie Drift Manage…
Jan 13, 2026
d850842
fix merge conflicts
jeffkala Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .cookiecutter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,18 @@
"version": "2.2.0",
"original_publish_year": "2025",
"_drift_manager": {
"template": "git@github.com:networktocode-llc/cookiecutter-ntc.git",
"template": "https://github.com/networktocode-llc/cookiecutter-ntc.git",
"template_dir": "python",
"template_ref": "main",
"cookie_dir": "",
"pull_request_strategy": "create",
"pull_request_strategy": "update-or-create",
"post_actions": [],
"draft": false,
<<<<<<< HEAD
"baked_commit_ref": "bc789d65fa90182c0eb392664e1cba02ea187ab1",
=======
"baked_commit_ref": "67d15ddeb638efb7c39ab746e97e7b9c96c16801",
>>>>>>> 4a41aa1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
"drift_managed_branch": "develop"
}
}
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ jobs:
poetry-version: "2.1.3"
python-version: "3.13"
poetry-install-options: "--no-root"
<<<<<<< HEAD
- name: "Build Documentation"
Copy link
Copy Markdown
Contributor

@jeffkala jeffkala Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

more of an FYI, Sirbu confirmed we don't need docs at all to be built here since we don't package the docs in our python libs.

run: "poetry run invoke build build-and-check-docs"
=======
>>>>>>> 4a41aa1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
- name: "Run Poetry Build"
run: "poetry build"

Expand Down Expand Up @@ -58,17 +61,31 @@ jobs:
if: "startsWith(github.ref, 'refs/tags/v')"
needs: "build"
environment: "pypi"
<<<<<<< HEAD
=======
# Steps to publish to PyPI.
>>>>>>> 4a41aa1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
steps:
- name: "Retrieve built package from cache"
uses: "actions/download-artifact@v4"
with:
name: "distfiles"
path: "dist/"
<<<<<<< HEAD
- name: "Publish package distribution to PyPI"
uses: "pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e" # v1.13.0
with:
user: "__token__"
password: "${{ secrets.PYPI_API_TOKEN }}"
=======
- name: "Publish package distributions to PyPI"
uses: "pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e" # v1.13.0
## Used for networktocode org since trusted publisher isn't supported for GitHub Plan.
with:
user: "__token__"
password: "${{ secrets.PYPI_API_TOKEN }}"
# End publish to PyPI job.
>>>>>>> 4a41aa1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)

slack-notify:
needs:
Expand Down
1 change: 1 addition & 0 deletions changes/+main.housekeeping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Rebaked from the cookie `main`.
4 changes: 4 additions & 0 deletions docs/admin/release_notes/version_1.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ This document describes all new features and changes in the release. The format

Initial release of DiffSync.

<<<<<<< HEAD
## [v1.0.0] - 2020-10-23
=======
## [v1.0.0] - 2026-01-13
>>>>>>> 4a41aa1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)

Initial release
Loading