Skip to content

Commit 915350d

Browse files
committed
Merge from hot-fix
2 parents 239bd7c + 7929358 commit 915350d

32 files changed

Lines changed: 729 additions & 34 deletions

.github/workflows/docs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939

4040
deploy:
4141
needs: build
42+
if: ${{ github.ref == 'refs/heads/main' }}
4243
runs-on: ubuntu-latest
4344
environment:
4445
name: github-pages

.github/workflows/publish-ghcr.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,29 @@ permissions:
1010
packages: write
1111

1212
jobs:
13+
tag-check:
14+
runs-on: ubuntu-latest
15+
outputs:
16+
is_on_main: ${{ steps.maincheck.outputs.is_on_main }}
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 0
22+
- name: Validate tag is on main
23+
id: maincheck
24+
shell: bash
25+
run: |
26+
git fetch --no-tags origin main
27+
if git merge-base --is-ancestor "${GITHUB_SHA}" "origin/main"; then
28+
echo "is_on_main=true" >> "${GITHUB_OUTPUT}"
29+
else
30+
echo "is_on_main=false" >> "${GITHUB_OUTPUT}"
31+
fi
32+
1333
build-and-push:
34+
needs: tag-check
35+
if: ${{ needs.tag-check.outputs.is_on_main == 'true' }}
1436
runs-on: ubuntu-latest
1537
steps:
1638
- name: Checkout

.github/workflows/publish-pypi.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ jobs:
1313
runs-on: ubuntu-latest
1414
outputs:
1515
is_ga: ${{ steps.check.outputs.is_ga }}
16+
is_on_main: ${{ steps.maincheck.outputs.is_on_main }}
1617
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 0
1722
- name: Validate GA tag
1823
id: check
1924
shell: bash
@@ -23,10 +28,20 @@ jobs:
2328
else
2429
echo "is_ga=false" >> "${GITHUB_OUTPUT}"
2530
fi
31+
- name: Validate tag is on main
32+
id: maincheck
33+
shell: bash
34+
run: |
35+
git fetch --no-tags origin main
36+
if git merge-base --is-ancestor "${GITHUB_SHA}" "origin/main"; then
37+
echo "is_on_main=true" >> "${GITHUB_OUTPUT}"
38+
else
39+
echo "is_on_main=false" >> "${GITHUB_OUTPUT}"
40+
fi
2641
2742
publish:
2843
needs: tag-check
29-
if: ${{ needs.tag-check.outputs.is_ga == 'true' }}
44+
if: ${{ needs.tag-check.outputs.is_ga == 'true' && needs.tag-check.outputs.is_on_main == 'true' }}
3045
runs-on: ubuntu-latest
3146
steps:
3247
- name: Checkout

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ backup/*
3131
issues/*
3232
deploy/docker/compose/.env
3333
AGENTS.md
34+
release-reports/
3435

3536
# PyPNM Dev tools
3637
log-level-rewriter.py

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ PyPNM is a DOCSIS 3.x/4.0 Proactive Network Maintenance toolkit for engineers wh
7171
Fast install (helper script; latest release auto-detected):
7272

7373
```bash
74-
TAG="v1.0.1.0"
74+
TAG="v1.0.2.10"
7575
PORT=8080
7676

7777
curl -fsSLo install-pypnm-docker-container.sh \

deploy/docker/config/system.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"json_transaction_db": ".data/db/json_transactions.json",
5656
"retries": 5,
5757
"retrival_method": {
58-
"method": "sftp",
58+
"method": "local",
5959
"methods": {
6060
"local": {
6161
"src_dir": "/srv/tftp",

deploy/docker/config/system.json.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"json_transaction_db": ".data/db/json_transactions.json",
5656
"retries": 5,
5757
"retrival_method": {
58-
"method": "sftp",
58+
"method": "local",
5959
"methods": {
6060
"local": {
6161
"src_dir": "/srv/tftp"
@@ -79,7 +79,7 @@
7979
"host": "localhost",
8080
"port": 22,
8181
"user": "dev01",
82-
"password_enc": "ENC[v1]:gAAAAABpPZXk8AyJkM9qfr32--dMZmTfuZMbosStbqHcQ7ScuDlr-mWIs0yzmU5OJueulRmiRQLRKCS0btK7cHYT0uNgSKPp4Q==",
82+
"password_enc": "",
8383
"private_key_path": "~/.ssh/id_rsa_pypnm",
8484
"remote_dir": "/srv/tftp"
8585
},

docs/docker/install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ PyPNM ships with Docker assets so you can run the API quickly on a workstation,
1515
## Fast path: PyPNM Docker container install
1616

1717
```bash
18-
TAG="v1.0.1.0"
18+
TAG="v1.0.2.10"
1919
PORT=8080
2020

2121
curl -fsSLo install-pypnm-docker-container.sh \
@@ -47,7 +47,7 @@ curl -X GET http://127.0.0.1:${PORT}/pypnm/system/webService/reload -H 'accept:
4747
## Deploy bundle flow (tarball)
4848

4949
```bash
50-
TAG="v1.0.1.0"
50+
TAG="v1.0.2.10"
5151
WORKING_DIR="PyPNM-${TAG}"
5252

5353
mkdir -p "${WORKING_DIR}"

docs/kubernetes/commands.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Deploy from GHCR using a remote manifest (no repo clone required):
7474
curl -fsSL https://raw.githubusercontent.com/PyPNMApps/PyPNM/main/tools/k8s/pypnm_k8s_remote_deploy.sh \
7575
-o /tmp/pypnm_k8s_remote_deploy.sh
7676

77-
TAG="v1.0.1.0"
77+
TAG="v1.0.2.10"
7878
NAMESPACE="pypnm-cmts-a"
7979

8080
bash /tmp/pypnm_k8s_remote_deploy.sh --create --tag "${TAG}" --namespace "${NAMESPACE}" --replicas 1

docs/kubernetes/kind-freelens.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ bash /tmp/pypnm_kind_vm_bootstrap.sh
2323
Pick a release tag, then deploy into a namespace (one namespace per CMTS). This script pulls manifests from GitHub, so no repo clone is required:
2424

2525
```bash
26-
TAG="v1.0.1.0"
26+
TAG="v1.0.2.10"
2727
NAMESPACE="pypnm-cmts-a"
2828

2929
curl -fsSL https://raw.githubusercontent.com/PyPNMApps/PyPNM/main/tools/k8s/pypnm_k8s_remote_deploy.sh \
@@ -111,7 +111,7 @@ Tip: keep one FreeLens workspace per CMTS namespace so it is easy to keep sessio
111111
Deploy a PyPNM instance per CMTS by assigning a unique namespace and configuration per CMTS:
112112

113113
```bash
114-
TAG="v1.0.1.0"
114+
TAG="v1.0.2.10"
115115
116116
for CMTS in cmts-a cmts-b cmts-c; do
117117
NAMESPACE="pypnm-${CMTS}"

0 commit comments

Comments
 (0)