From 7cf1f8fbef39055941ff369dd2a460a35649c009 Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Thu, 13 Oct 2022 07:58:49 -0300 Subject: [PATCH] Updated for new release --- README.md | 5 +++-- do_tag.py | 7 ++++--- push.sh | 32 ++++++++++++++++---------------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 52500d0..18a6735 100644 --- a/README.md +++ b/README.md @@ -26,11 +26,12 @@ The available tags are: * **10.4-5.1.6** is KiCad 5.1.6 on Debian 10.4 with KiBot 0.7.0, kicad-automation-scripts 1.4.2, KiBoM 1.8.0, interactivehtmlbom 2.3.3 and PcbDraw 0.6.0-2 * **10.4-5.1.9** is KiCad 5.1.9 on Debian 10.4 with KiBot 1.2.0, KiAuto 1.6.15, KiBoM 1.8.0, interactivehtmlbom 2.5.0, KiCost 1.1.10 (+Digi-Key plug-in) and PcbDraw 0.9.0-3 * **11.4-5.1.9** is KiCad 5.1.9 on Debian 11.4 with KiBot 1.3.0, KiAuto 1.6.15, KiBoM 1.8.0, interactivehtmlbom 2.5.0, KiCost 1.1.10 (+Digi-Key plug-in), PcbDraw 0.9.0-3 and KiDiff 2.2.0 -* **11.5-5.1.9** (same as **latest**) is KiCad 5.1.9 on Debian 11.5 with KiBot 1.3.0, KiAuto 2.0.6, KiBoM 1.8.0, interactivehtmlbom 2.5.0, KiCost 1.1.12 (+Digi-Key plug-in), PcbDraw 0.9.0-4 and KiDiff 2.4.2 +* **11.5-5.1.9** (same as **latest**) is KiCad 5.1.9 on Debian 11.5 with KiBot 1.4.0, KiAuto 2.0.6, KiBoM 1.8.0, interactivehtmlbom 2.5.0, KiCost 1.1.12 (+Digi-Key plug-in), PcbDraw 0.9.0-5 and KiDiff 2.4.2 * **bullseye-6.0.0-RC1-20211204** (same as **nightly**) is KiCad 6.0.0 RC1 (20211204) on Debian bullseye with KiBot 0.11.0, kicad-automation-scripts 1.6.5, KiBoM 1.8.0, interactivehtmlbom 2.4.1, KiCost 1.1.5 (+Digi-Key plug-in) and PcbDraw 0.9.0-1 * **ki6.0.0_Ubuntu21.10** KiCad 6.0.0 (final release) on Ubuntu Impish with KiBot 0.11.0, kicad-automation-scripts 1.6.5, KiBoM 1.8.0, interactivehtmlbom 2.4.1, KiCost 1.1.5 (+Digi-Key plug-in) and PcbDraw 0.9.0-1 * **ki6.0.6_Debian** KiCad 6.0.6 (6.0.7 libs) on Debian 11.4 with KiBot 1.2.0, kicad-automation-scripts 1.6.15, KiBoM 1.8.0, interactivehtmlbom 2.5.0, KiCost 1.1.10 (+Digi-Key plug-in) and PcbDraw 0.9.0-3 -* **ki6.0.7_Debian** (same as **ki6**) KiCad 6.0.7 on Debian 11.5 with KiBot 1.3.0, kicad-automation-scripts 2.0.6, KiBoM 1.8.0, interactivehtmlbom 2.5.0, KiCost 1.1.12 (+Digi-Key plug-in), PcbDraw 0.9.0-4 and KiDiff 2.4.2 +* **ki6.0.7_Debian** KiCad 6.0.7 on Debian 11.5 with KiBot 1.4.0, kicad-automation-scripts 2.0.6, KiBoM 1.8.0, interactivehtmlbom 2.5.0, KiCost 1.1.12 (+Digi-Key plug-in), PcbDraw 0.9.0-4 and KiDiff 2.4.2 +* **ki6.0.8_Debian** (same as **ki6**) KiCad 6.0.8 on Debian 11.5 with KiBot 1.4.0, kicad-automation-scripts 2.0.6, KiBoM 1.8.0, interactivehtmlbom 2.5.0, KiCost 1.1.12 (+Digi-Key plug-in), PcbDraw 0.9.0-5 and KiDiff 2.4.2 You can run it using a script like this: diff --git a/do_tag.py b/do_tag.py index 56b88bb..2397e7d 100755 --- a/do_tag.py +++ b/do_tag.py @@ -4,13 +4,14 @@ import re import stat import subprocess -CUR_VERSION = '1.3.0' +CUR_VERSION = '1.4.0' CUR_K5 = '5.1.9' -CUR_K6 = '6.0.7' +CUR_K6 = '6.0.8' CUR_DEB = '11.5' +ITERA = '2' TAGS = {'latest': CUR_DEB+'-'+CUR_K5, 'ki6': 'ki'+CUR_K6+'_Debian'} -NEW_TAGS = {'latest': '-2_k'+CUR_K5+'_d'+CUR_DEB, 'ki6': '-2_k'+CUR_K6+'_d'+CUR_DEB} +NEW_TAGS = {'latest': '-'+ITERA+'_k'+CUR_K5+'_d'+CUR_DEB, 'ki6': '-'+ITERA+'_k'+CUR_K6+'_d'+CUR_DEB} NEW_DEB1 = {'latest': CUR_K5, 'ki6': CUR_K6} NEW_DEB2 = {'latest': CUR_K5+'_d'+CUR_DEB, 'ki6': CUR_K6+'_d'+CUR_DEB} IMAGES = ['kicad_debian', 'kicad_auto', 'kicad_auto_test'] diff --git a/push.sh b/push.sh index a1ecae5..94f629b 100755 --- a/push.sh +++ b/push.sh @@ -1,37 +1,37 @@ #!/bin/sh docker push setsoft/kicad_debian:11.5-5.1.9 -docker push setsoft/kicad_debian:ki6.0.7_Debian +docker push setsoft/kicad_debian:ki6.0.8_Debian docker push setsoft/kicad_auto:11.5-5.1.9 -docker push setsoft/kicad_auto:ki6.0.7_Debian +docker push setsoft/kicad_auto:ki6.0.8_Debian docker push setsoft/kicad_auto_test:11.5-5.1.9 -docker push setsoft/kicad_auto_test:ki6.0.7_Debian +docker push setsoft/kicad_auto_test:ki6.0.8_Debian docker push ghcr.io/inti-cmnb/kicad_debian:11.5-5.1.9 -docker push ghcr.io/inti-cmnb/kicad_debian:ki6.0.7_Debian +docker push ghcr.io/inti-cmnb/kicad_debian:ki6.0.8_Debian docker push ghcr.io/inti-cmnb/kicad_auto:11.5-5.1.9 -docker push ghcr.io/inti-cmnb/kicad_auto:ki6.0.7_Debian +docker push ghcr.io/inti-cmnb/kicad_auto:ki6.0.8_Debian docker push ghcr.io/inti-cmnb/kicad_auto_test:11.5-5.1.9 -docker push ghcr.io/inti-cmnb/kicad_auto_test:ki6.0.7_Debian +docker push ghcr.io/inti-cmnb/kicad_auto_test:ki6.0.8_Debian docker push ghcr.io/inti-cmnb/kicad_debian:latest docker push ghcr.io/inti-cmnb/kicad_debian:ki6 docker push ghcr.io/inti-cmnb/kicad5_debian:latest docker push ghcr.io/inti-cmnb/kicad5_debian:5.1.9 docker push ghcr.io/inti-cmnb/kicad5_debian:5.1.9_d11.5 docker push ghcr.io/inti-cmnb/kicad6_debian:latest -docker push ghcr.io/inti-cmnb/kicad6_debian:6.0.7 -docker push ghcr.io/inti-cmnb/kicad6_debian:6.0.7_d11.5 +docker push ghcr.io/inti-cmnb/kicad6_debian:6.0.8 +docker push ghcr.io/inti-cmnb/kicad6_debian:6.0.8_d11.5 docker push ghcr.io/inti-cmnb/kicad_auto:latest docker push ghcr.io/inti-cmnb/kicad_auto:ki6 docker push ghcr.io/inti-cmnb/kicad5_auto:latest -docker push ghcr.io/inti-cmnb/kicad5_auto:1.3.0 -docker push ghcr.io/inti-cmnb/kicad5_auto:1.3.0-2_k5.1.9_d11.5 +docker push ghcr.io/inti-cmnb/kicad5_auto:1.4.0 +docker push ghcr.io/inti-cmnb/kicad5_auto:1.4.0-2_k5.1.9_d11.5 docker push ghcr.io/inti-cmnb/kicad6_auto:latest -docker push ghcr.io/inti-cmnb/kicad6_auto:1.3.0 -docker push ghcr.io/inti-cmnb/kicad6_auto:1.3.0-2_k6.0.7_d11.5 +docker push ghcr.io/inti-cmnb/kicad6_auto:1.4.0 +docker push ghcr.io/inti-cmnb/kicad6_auto:1.4.0-2_k6.0.8_d11.5 docker push ghcr.io/inti-cmnb/kicad_auto_test:latest docker push ghcr.io/inti-cmnb/kicad_auto_test:ki6 docker push ghcr.io/inti-cmnb/kicad5_auto_full:latest -docker push ghcr.io/inti-cmnb/kicad5_auto_full:1.3.0 -docker push ghcr.io/inti-cmnb/kicad5_auto_full:1.3.0-2_k5.1.9_d11.5 +docker push ghcr.io/inti-cmnb/kicad5_auto_full:1.4.0 +docker push ghcr.io/inti-cmnb/kicad5_auto_full:1.4.0-2_k5.1.9_d11.5 docker push ghcr.io/inti-cmnb/kicad6_auto_full:latest -docker push ghcr.io/inti-cmnb/kicad6_auto_full:1.3.0 -docker push ghcr.io/inti-cmnb/kicad6_auto_full:1.3.0-2_k6.0.7_d11.5 +docker push ghcr.io/inti-cmnb/kicad6_auto_full:1.4.0 +docker push ghcr.io/inti-cmnb/kicad6_auto_full:1.4.0-2_k6.0.8_d11.5