Skip to content

Commit dd991b3

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/jdiff.git", "path": "/tmp/tmpsojfg761/jdiff", "repository_path": "/tmp/tmpsojfg761/jdiff", "dir": "", "branch_prefix": "drift-manager/develop", "context": { "codeowner_github_usernames": "@lvrfrc87 @scetron @grelleum @jeffkala @pszulczewski", "full_name": "Network to Code, LLC", "email": "info@networktocode.com", "github_org": "networktocode", "description": "Python library for examining structured data.", "project_name": "jdiff", "project_slug": "jdiff", "repo_url": "https://github.com/networktocode/jdiff", "base_url": "jdiff", "project_python_name": "jdiff", "project_python_base_version": "3.10", "project_with_config_settings": "no", "generate_docs": "yes", "version": "1.0.1", "original_publish_year": "2022", "_template": "/__w/cookiecutter-nautobot-app-drift-manager/cookiecutter-nautobot-app-drift-manager/cookiecutter-ntc/python", "_output_dir": "/tmp/tmpsojfg761", "_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": "bc931311336d391d878202dba239389783ee9f09", "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 28425c2 commit dd991b3

10 files changed

Lines changed: 189 additions & 9 deletions

File tree

‎.cookiecutter.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<<<<<<< HEAD
2727
<<<<<<< HEAD
2828
<<<<<<< HEAD
29+
<<<<<<< HEAD
2930
<<<<<<< HEAD
3031
"baked_commit_ref": "bc931311336d391d878202dba239389783ee9f09",
3132
=======
@@ -40,6 +41,9 @@
4041
=======
4142
"baked_commit_ref": "deef9612dfe442697dee955a6211c0509deaf437",
4243
>>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
44+
=======
45+
"baked_commit_ref": "bc1314d447b3f79de49ebcb566187d7599f357b0",
46+
>>>>>>> 7afecc1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
4347
"drift_managed_branch": "develop"
4448
}
4549
}

‎.github/workflows/ci.yml‎

Lines changed: 55 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
INVOKE_JDIFF_LOCAL: "True"
2222
steps:
2323
- name: "Check out repository code"
24-
uses: "actions/checkout@v4"
24+
uses: "actions/checkout@v7"
2525
- name: "Setup environment"
2626
uses: "networktocode/gh-action-setup-poetry-environment@v7"
2727
with:
@@ -34,7 +34,7 @@ jobs:
3434
INVOKE_JDIFF_LOCAL: "True"
3535
steps:
3636
- name: "Check out repository code"
37-
uses: "actions/checkout@v4"
37+
uses: "actions/checkout@v7"
3838
- name: "Setup environment"
3939
uses: "networktocode/gh-action-setup-poetry-environment@v7"
4040
with:
@@ -47,7 +47,7 @@ jobs:
4747
INVOKE_JDIFF_LOCAL: "True"
4848
steps:
4949
- name: "Check out repository code"
50-
uses: "actions/checkout@v4"
50+
uses: "actions/checkout@v7"
5151
- name: "Setup environment"
5252
uses: "networktocode/gh-action-setup-poetry-environment@v7"
5353
with:
@@ -61,7 +61,7 @@ jobs:
6161
INVOKE_JDIFF_LOCAL: "True"
6262
steps:
6363
- name: "Check out repository code"
64-
uses: "actions/checkout@v4"
64+
uses: "actions/checkout@v7"
6565
- name: "Setup environment"
6666
uses: "networktocode/gh-action-setup-poetry-environment@v7"
6767
with:
@@ -74,7 +74,7 @@ jobs:
7474
INVOKE_JDIFF_LOCAL: "True"
7575
steps:
7676
- name: "Check out repository code"
77-
uses: "actions/checkout@v4"
77+
uses: "actions/checkout@v7"
7878
- name: "Setup environment"
7979
uses: "networktocode/gh-action-setup-poetry-environment@v7"
8080
with:
@@ -91,15 +91,58 @@ jobs:
9191
strategy:
9292
fail-fast: true
9393
matrix:
94+
<<<<<<< HEAD
9495
python-version: ["3.10"]
96+
=======
97+
python-version: ["3.10", "3.14"]
9598
env:
9699
INVOKE_JDIFF_PYTHON_VER: "${{ matrix.python-version }}"
97100
steps:
98101
- name: "Check out repository code"
99-
uses: "actions/checkout@v4"
102+
uses: "actions/checkout@v7"
103+
- name: "Setup environment"
104+
uses: "networktocode/gh-action-setup-poetry-environment@v7"
105+
with:
106+
poetry-version: "2.1.3"
107+
- name: "Get image version"
108+
run: "echo INVOKE_JDIFF_IMAGE_VER=`poetry version -s`-py${{ matrix.python-version }} >> $GITHUB_ENV"
109+
- name: "Set up Docker Buildx"
110+
id: "buildx"
111+
uses: "docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e" # v4.3.0
112+
- name: "Build"
113+
uses: "docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a" # v7.3.0
114+
with:
115+
builder: "${{ steps.buildx.outputs.name }}"
116+
context: "./"
117+
push: false
118+
load: true
119+
tags: "${{ env.INVOKE_JDIFF_IMAGE_NAME }}:${{ env.INVOKE_JDIFF_IMAGE_VER }}"
120+
file: "./Dockerfile"
121+
cache-from: "type=gha,scope=${{ env.INVOKE_JDIFF_IMAGE_NAME }}-${{ env.INVOKE_JDIFF_IMAGE_VER }}-py${{ matrix.python-version }}"
122+
cache-to: "type=gha,scope=${{ env.INVOKE_JDIFF_IMAGE_NAME }}-${{ env.INVOKE_JDIFF_IMAGE_VER }}-py${{ matrix.python-version }}"
123+
build-args: |
124+
PYTHON_VER=${{ matrix.python-version }}
125+
- name: "Linting: Pylint"
126+
run: "poetry run invoke pylint"
127+
pytest:
128+
needs:
129+
- "check-in-docker"
130+
strategy:
131+
fail-fast: true
132+
matrix:
133+
python-version: ["3.10", "3.14"]
134+
runs-on: "ubuntu-latest"
135+
>>>>>>> 7afecc1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
136+
env:
137+
INVOKE_JDIFF_PYTHON_VER: "${{ matrix.python-version }}"
138+
INVOKE_JDIFF_LOCAL: "True"
139+
steps:
140+
- name: "Check out repository code"
141+
uses: "actions/checkout@v7"
100142
- name: "Setup environment"
101143
<<<<<<< HEAD
102144
<<<<<<< HEAD
145+
<<<<<<< HEAD
103146
<<<<<<< HEAD
104147
uses: "networktocode/gh-action-setup-poetry-environment@v6"
105148
=======
@@ -220,6 +263,11 @@ jobs:
220263
>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
221264
=======
222265
>>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
266+
=======
267+
uses: "networktocode/gh-action-setup-poetry-environment@v7"
268+
with:
269+
poetry-version: "2.1.3"
270+
>>>>>>> 7afecc1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
223271
- name: "Run Tests"
224272
run: "poetry run invoke pytest"
225273
changelog:
@@ -229,7 +277,7 @@ jobs:
229277
runs-on: "ubuntu-latest"
230278
steps:
231279
- name: "Check out repository code"
232-
uses: "actions/checkout@v4"
280+
uses: "actions/checkout@v7"
233281
with:
234282
fetch-depth: "0"
235283
- name: "Setup environment"

‎.github/workflows/prepare_release.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,28 @@ on: # yamllint disable-line rule:truthy rule:comments
2424
<<<<<<< HEAD
2525
<<<<<<< HEAD
2626
<<<<<<< HEAD
27+
<<<<<<< HEAD
2728
=======
2829
=======
2930
>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
3031
=======
3132
>>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
33+
=======
34+
>>>>>>> 7afecc1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
3235
previous_version:
3336
description: "The previous version tag to use for generating release notes (defaults to the latest tag or initial commit if no tags exist)."
3437
required: false
3538
default: ""
3639
<<<<<<< HEAD
3740
<<<<<<< HEAD
41+
<<<<<<< HEAD
3842
>>>>>>> f3dca29 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
3943
=======
4044
>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
4145
=======
4246
>>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
47+
=======
48+
>>>>>>> 7afecc1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
4349

4450
jobs:
4551
prepare-release:
@@ -50,7 +56,11 @@ jobs:
5056
runs-on: "ubuntu-latest"
5157
steps:
5258
- name: "Checkout code"
59+
<<<<<<< HEAD
5360
uses: "actions/checkout@v4"
61+
=======
62+
uses: "actions/checkout@v7"
63+
>>>>>>> 7afecc1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
5464
with:
5565
# If target_branch is 'main', use 'develop' as the source branch. Otherwise, the source and target branch are the same.
5666
ref: "${{ github.event.inputs['target_branch'] == 'main' && 'develop' || github.event.inputs['target_branch'] }}"
@@ -59,6 +69,7 @@ jobs:
5969
- name: "Setup environment"
6070
<<<<<<< HEAD
6171
<<<<<<< HEAD
72+
<<<<<<< HEAD
6273
<<<<<<< HEAD
6374
uses: "networktocode/gh-action-setup-poetry-environment@v6"
6475
=======
@@ -70,6 +81,9 @@ jobs:
7081
=======
7182
uses: "networktocode/gh-action-setup-poetry-environment@v7"
7283
>>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
84+
=======
85+
uses: "networktocode/gh-action-setup-poetry-environment@v7"
86+
>>>>>>> 7afecc1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
7387
with:
7488
poetry-version: "2.1.3"
7589
poetry-install-options: "--with dev"
@@ -86,25 +100,31 @@ jobs:
86100
# If it fails (no tags), get the hash of the first commit
87101
<<<<<<< HEAD
88102
<<<<<<< HEAD
103+
<<<<<<< HEAD
89104
<<<<<<< HEAD
90105
if PREV_TAG=$(git describe --tags --abbrev=0 2>/dev/null); then
91106
=======
92107
=======
93108
>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
94109
=======
95110
>>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
111+
=======
112+
>>>>>>> 7afecc1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
96113
if [ -n "${{ github.event.inputs.previous_version }}" ]; then
97114
PREV_TAG="${{ github.event.inputs.previous_version }}"
98115
echo "Using user-specified previous version: $PREV_TAG"
99116
echo "PREVIOUS_TAG=$PREV_TAG" >> $GITHUB_ENV
100117
elif PREV_TAG=$(git describe --tags --abbrev=0 2>/dev/null); then
101118
<<<<<<< HEAD
102119
<<<<<<< HEAD
120+
<<<<<<< HEAD
103121
>>>>>>> f3dca29 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
104122
=======
105123
>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
106124
=======
107125
>>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
126+
=======
127+
>>>>>>> 7afecc1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
108128
echo "PREVIOUS_TAG=$PREV_TAG" >> $GITHUB_ENV
109129
echo "Found previous tag: $PREV_TAG"
110130
else
@@ -118,6 +138,7 @@ jobs:
118138
id: "versioning"
119139
<<<<<<< HEAD
120140
<<<<<<< HEAD
141+
<<<<<<< HEAD
121142
<<<<<<< HEAD
122143
run: |
123144
# Perform the bump based on the user input
@@ -127,6 +148,8 @@ jobs:
127148
>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
128149
=======
129150
>>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
151+
=======
152+
>>>>>>> 7afecc1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
130153
env:
131154
GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
132155
run: |
@@ -148,11 +171,14 @@ jobs:
148171
fi
149172
<<<<<<< HEAD
150173
<<<<<<< HEAD
174+
<<<<<<< HEAD
151175
>>>>>>> f3dca29 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
152176
=======
153177
>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
154178
=======
155179
>>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
180+
=======
181+
>>>>>>> 7afecc1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
156182

157183
# Capture the New version string for use in other steps
158184
NEW_VER=$(poetry version --short)
@@ -225,6 +251,7 @@ jobs:
225251
226252
<<<<<<< HEAD
227253
<<<<<<< HEAD
254+
<<<<<<< HEAD
228255
<<<<<<< HEAD
229256
- name: "Generate Release Notes"
230257
=======
@@ -236,6 +263,9 @@ jobs:
236263
=======
237264
- name: "Generate App Release Notes and update mkdocs.yml"
238265
>>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
266+
=======
267+
- name: "Generate App Release Notes and update mkdocs.yml"
268+
>>>>>>> 7afecc1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
239269
run: "poetry run inv generate-release-notes --version '${{ env.NEW_VERSION }}' --date '${{ env.RELEASE_DATE }}'"
240270

241271
- name: "Commit Changes and Push"

0 commit comments

Comments
 (0)