From eeb1ec86ac89700c491b57a3aa519a0205815b24 Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Thu, 16 Mar 2023 13:21:15 -0300 Subject: [PATCH 1/3] [GHA] Dockerfile for KiBot 1.6.0 + KiCad 5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fc9b85b4..753e5210 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/inti-cmnb/kicad5_auto:1.4.0-8_k5.1.9_d11.5 +FROM ghcr.io/inti-cmnb/kicad5_auto:1.6.0-1_k5.1.9_d11.6 LABEL AUTHOR Salvador E. Tropea LABEL Description="Export various files from KiCad projects (KiCad 6)" From 0ae34fb93b826354558884b9c7320bb3a5f1681a Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Thu, 16 Mar 2023 13:24:29 -0300 Subject: [PATCH 2/3] [GHA] Dockerfile for KiCad 6 and KiBot 1.6.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 753e5210..45f57347 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/inti-cmnb/kicad5_auto:1.6.0-1_k5.1.9_d11.6 +FROM ghcr.io/inti-cmnb/kicad6_auto:1.6.0-1_k6.0.10_d11.6 LABEL AUTHOR Salvador E. Tropea LABEL Description="Export various files from KiCad projects (KiCad 6)" From 1341f115c061f2688024d725206e7f4b44cb8c5d Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Thu, 16 Mar 2023 13:26:20 -0300 Subject: [PATCH 3/3] [DOCs] Added the new GHA tags --- README.md | 6 +++++- docs/README.in | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b547d9db..64be8f8c 100644 --- a/README.md +++ b/README.md @@ -5539,7 +5539,7 @@ jobs: path: output ``` -For KiCad 6 use `v2_k6` instead of `v2`. +For KiCad 6 use `v2_k6` instead of `v2` (`v2_k7` for KiCad 7). These actions use the last KiBot stable release, to use the current development code use `v2_dk6` (KiCad 6) and `v2_d` (KiCad 5). A working example applied to a repo can be found [here](https://github.com/INTI-CMNB/kicad-ci-test-spora/tree/test_gh_action) @@ -5579,10 +5579,14 @@ There are several tags you can choose: | v2_k6_1_4_0 | 2 | 1.4.0 | 6.0.9 | | v2_1_5_1 | 2 | 1.5.1 | 5.1.9 | | v2_k6_1_5_1 | 2 | 1.5.1 | 6.0.9 | +| v2_1_6_0 | 2 | 1.6.0 | 5.1.9 | +| v2_k6_1_6_0 | 2 | 1.6.0 | 6.0.9 | | v2 | 2 | last release | 5.1.9 | | v2_k6 | 2 | last release | 6.x | +| v2_k7 | 2 | last release | 7.x | | v2_d | 2 | git code | 5.1.9 | | v2_dk6 | 2 | git code | 6.x | +| v2_dk7 | 2 | git code | 7.x | The main differences between API 1 and 2 are: diff --git a/docs/README.in b/docs/README.in index a88822db..64f58990 100644 --- a/docs/README.in +++ b/docs/README.in @@ -1654,7 +1654,7 @@ jobs: path: output ``` -For KiCad 6 use `v2_k6` instead of `v2`. +For KiCad 6 use `v2_k6` instead of `v2` (`v2_k7` for KiCad 7). These actions use the last KiBot stable release, to use the current development code use `v2_dk6` (KiCad 6) and `v2_d` (KiCad 5). A working example applied to a repo can be found [here](https://github.com/INTI-CMNB/kicad-ci-test-spora/tree/test_gh_action) @@ -1694,10 +1694,14 @@ There are several tags you can choose: | v2_k6_1_4_0 | 2 | 1.4.0 | 6.0.9 | | v2_1_5_1 | 2 | 1.5.1 | 5.1.9 | | v2_k6_1_5_1 | 2 | 1.5.1 | 6.0.9 | +| v2_1_6_0 | 2 | 1.6.0 | 5.1.9 | +| v2_k6_1_6_0 | 2 | 1.6.0 | 6.0.9 | | v2 | 2 | last release | 5.1.9 | | v2_k6 | 2 | last release | 6.x | +| v2_k7 | 2 | last release | 7.x | | v2_d | 2 | git code | 5.1.9 | | v2_dk6 | 2 | git code | 6.x | +| v2_dk7 | 2 | git code | 7.x | The main differences between API 1 and 2 are: