Skip to content

Commit 6089bb9

Browse files
set-softset-soft
committed
Merge branch 'dev' for release
2 parents 367a2e0 + 9e37c10 commit 6089bb9

763 files changed

Lines changed: 579189 additions & 20427 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/dev_images.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
# Bulleyes backports no longer exists dev_image_k5, dev_image_k5f,
13-
ki_release: [dev_image_k6, dev_image_k7, dev_image_k8, dev_image_k9, dev_image_k6f, dev_image_k7f, dev_image_k8f, dev_image_k9f]
13+
ki_release: [dev_image_k6, dev_image_k7, dev_image_k8, dev_image_k9, dev_image_k10, dev_image_k6f, dev_image_k7f, dev_image_k8f, dev_image_k9f, dev_image_k10f]
1414

1515
name: Docker ${{ matrix.ki_release }}
1616
runs-on: ubuntu-latest
@@ -22,16 +22,16 @@ jobs:
2222

2323
steps:
2424
- name: Check out the repo
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v6
2626

2727
- name: Log in to Docker Hub
28-
uses: docker/login-action@v3
28+
uses: docker/login-action@v4
2929
with:
3030
username: ${{ secrets.DOCKER_USERNAME }}
3131
password: ${{ secrets.DOCKER_PASSWORD }}
3232

3333
- name: Log in to the Container registry
34-
uses: docker/login-action@v3
34+
uses: docker/login-action@v4
3535
with:
3636
registry: ghcr.io
3737
username: ${{ github.actor }}

‎.github/workflows/pre-commit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- run: sudo apt-get update && sudo apt-get install cppcheck
1515
if: false
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
1717
- uses: actions/setup-python@v5
1818
with:
1919
cache: pip

‎.github/workflows/pythonapp.yml‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ jobs:
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
ki_release: [ki5, ki6, ki7, ki8, ki9]
34+
# ki5
35+
ki_release: [ki6, ki7, ki8, ki9, ki10]
3536
w_tests: [g1, g2, g3]
3637
# ki_release: [nightly]
3738
# w_tests: [gdebug]
@@ -40,7 +41,7 @@ jobs:
4041
container: ghcr.io/inti-cmnb/kicad_auto_test:${{ matrix.ki_release }}
4142

4243
steps:
43-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v6
4445
with:
4546
submodules: recursive
4647
- name: Test ${{ matrix.ki_release }}
@@ -89,7 +90,7 @@ jobs:
8990
./${{ matrix.w_tests }}.sh
9091
- name: Store coverage
9192
if: ${{ always() }}
92-
uses: actions/upload-artifact@v4
93+
uses: actions/upload-artifact@v7
9394
with:
9495
name: Test_Coverage_${{ matrix.ki_release }}_${{ matrix.w_tests }}
9596
path: .coverage.*
@@ -103,7 +104,7 @@ jobs:
103104
ls -la coverage* .coverage*
104105
- name: Store results
105106
if: ${{ always() }}
106-
uses: actions/upload-artifact@v4
107+
uses: actions/upload-artifact@v7
107108
with:
108109
name: Test_Output_${{ matrix.ki_release }}_${{ matrix.w_tests }}
109110
# Important! empty directories are skipped!!!!
@@ -167,7 +168,7 @@ jobs:
167168
container: ghcr.io/inti-cmnb/kicad_auto_test:ki8
168169

169170
steps:
170-
- uses: actions/checkout@v4
171+
- uses: actions/checkout@v6
171172
with:
172173
submodules: recursive
173174
- name: Lint with flake8
@@ -189,7 +190,7 @@ jobs:
189190
./g4.sh
190191
- name: Store coverage
191192
if: ${{ always() }}
192-
uses: actions/upload-artifact@v4
193+
uses: actions/upload-artifact@v7
193194
with:
194195
name: Test_Coverage_Independent
195196
path: .coverage.*
@@ -201,7 +202,7 @@ jobs:
201202
python3-coverage html -d output/htmlcov_independent
202203
- name: Store results
203204
if: ${{ always() }}
204-
uses: actions/upload-artifact@v4
205+
uses: actions/upload-artifact@v7
205206
with:
206207
name: Test_Output_Independent
207208
# Important! empty directories are skipped!!!!
@@ -242,42 +243,42 @@ jobs:
242243
#if: github.ref == 'refs/heads/dev'
243244

244245
steps:
245-
- uses: actions/checkout@v4
246+
- uses: actions/checkout@v6
246247
with:
247248
submodules: recursive
248249

249-
- name: Download coverage k5 g1
250-
uses: actions/download-artifact@v4
251-
with:
252-
name: Test_Coverage_ki5_g1
253-
254-
- name: Download coverage k5 g2
255-
uses: actions/download-artifact@v4
256-
with:
257-
name: Test_Coverage_ki5_g2
250+
# - name: Download coverage k5 g1
251+
# uses: actions/download-artifact@v8
252+
# with:
253+
# name: Test_Coverage_ki5_g1
258254

259-
- name: Download coverage k5 g3
260-
uses: actions/download-artifact@v4
261-
with:
262-
name: Test_Coverage_ki5_g3
255+
# - name: Download coverage k5 g2
256+
# uses: actions/download-artifact@v8
257+
# with:
258+
# name: Test_Coverage_ki5_g2
259+
#
260+
# - name: Download coverage k5 g3
261+
# uses: actions/download-artifact@v8
262+
# with:
263+
# name: Test_Coverage_ki5_g3
263264

264265
- name: Download coverage k6 g1
265-
uses: actions/download-artifact@v4
266+
uses: actions/download-artifact@v8
266267
with:
267268
name: Test_Coverage_ki6_g1
268269

269270
- name: Download coverage k6 g2
270-
uses: actions/download-artifact@v4
271+
uses: actions/download-artifact@v8
271272
with:
272273
name: Test_Coverage_ki6_g2
273274

274275
- name: Download coverage k6 g3
275-
uses: actions/download-artifact@v4
276+
uses: actions/download-artifact@v8
276277
with:
277278
name: Test_Coverage_ki6_g3
278279

279280
- name: Download coverage independent
280-
uses: actions/download-artifact@v4
281+
uses: actions/download-artifact@v8
281282
with:
282283
name: Test_Coverage_Independent
283284

@@ -290,7 +291,7 @@ jobs:
290291
python3-coverage html -d htmlcov
291292
292293
- name: Store result
293-
uses: actions/upload-artifact@v4
294+
uses: actions/upload-artifact@v7
294295
with:
295296
name: Test_Coverage_combined
296297
path: htmlcov

‎.github/workflows/pythonapp_test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
container: ghcr.io/inti-cmnb/kicad_auto_test:${{ matrix.ki_release }}
2121

2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v6
2424
with:
2525
submodules: recursive
2626
- name: Test ${{ matrix.ki_release }}
@@ -150,7 +150,7 @@ jobs:
150150
container: ghcr.io/inti-cmnb/kicad_auto_test:ki8
151151

152152
steps:
153-
- uses: actions/checkout@v4
153+
- uses: actions/checkout@v6
154154
with:
155155
submodules: recursive
156156
- name: Lint with flake8
@@ -225,7 +225,7 @@ jobs:
225225
#if: github.ref == 'refs/heads/dev'
226226

227227
steps:
228-
- uses: actions/checkout@v4
228+
- uses: actions/checkout@v6
229229
with:
230230
submodules: recursive
231231

‎.github/workflows/refresh_images.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,23 @@ name: Docker images refresh
33
on:
44
repository_dispatch:
55
types: [refresh_images]
6+
workflow_dispatch:
67

78
jobs:
89
release:
910
runs-on: ubuntu-latest
1011
steps:
11-
- name: Trigger kicad_auto image build
12+
- name: Trigger kicad_auto/test image build
1213
run: |
13-
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto/dispatches --data '{"event_type": "build_k5"}'
14+
# curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto/dispatches --data '{"event_type": "build_k5"}'
1415
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto/dispatches --data '{"event_type": "build_k6"}'
1516
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto/dispatches --data '{"event_type": "build_k7"}'
1617
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto/dispatches --data '{"event_type": "build_k8"}'
17-
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto_test/dispatches --data '{"event_type": "build_k5"}'
18+
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto/dispatches --data '{"event_type": "build_k9"}'
19+
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto/dispatches --data '{"event_type": "build_k10"}'
20+
# curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto_test/dispatches --data '{"event_type": "build_k5"}'
1821
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto_test/dispatches --data '{"event_type": "build_k6"}'
1922
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto_test/dispatches --data '{"event_type": "build_k7"}'
2023
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto_test/dispatches --data '{"event_type": "build_k8"}'
24+
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto_test/dispatches --data '{"event_type": "build_k9"}'
25+
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto_test/dispatches --data '{"event_type": "build_k10"}'

‎.github/workflows/refresh_images_pre.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,23 @@ name: Docker images refresh w/pre
33
on:
44
repository_dispatch:
55
types: [refresh_images_pre]
6+
workflow_dispatch:
67

78
jobs:
89
release:
910
runs-on: ubuntu-latest
1011
steps:
1112
- name: Trigger kicad_auto image build
1213
run: |
13-
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto/dispatches --data '{"event_type": "build_k5p"}'
14+
# curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto/dispatches --data '{"event_type": "build_k5p"}'
1415
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto/dispatches --data '{"event_type": "build_k6p"}'
1516
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto/dispatches --data '{"event_type": "build_k7p"}'
1617
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto/dispatches --data '{"event_type": "build_k8p"}'
17-
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto_test/dispatches --data '{"event_type": "build_k5p"}'
18+
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto/dispatches --data '{"event_type": "build_k9p"}'
19+
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto/dispatches --data '{"event_type": "build_k10p"}'
20+
# curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto_test/dispatches --data '{"event_type": "build_k5p"}'
1821
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto_test/dispatches --data '{"event_type": "build_k6p"}'
1922
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto_test/dispatches --data '{"event_type": "build_k7p"}'
2023
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto_test/dispatches --data '{"event_type": "build_k8p"}'
24+
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto_test/dispatches --data '{"event_type": "build_k9p"}'
25+
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/INTI-CMNB/kicad_auto_test/dispatches --data '{"event_type": "build_k10p"}'

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
steps:
4646
- name: Checkout
47-
uses: actions/checkout@v1
47+
uses: actions/checkout@v6
4848

4949
- name: Build
5050
id: mdeb
@@ -56,7 +56,7 @@ jobs:
5656
mv *.deb output
5757
5858
- name: Store
59-
uses: actions/upload-artifact@v4
59+
uses: actions/upload-artifact@v7
6060
with:
6161
name: package
6262
path: output
@@ -66,10 +66,10 @@ jobs:
6666
runs-on: ubuntu-latest
6767
steps:
6868
- name: Checkout
69-
uses: actions/checkout@v1
69+
uses: actions/checkout@v6
7070

7171
- name: Retrieve
72-
uses: actions/download-artifact@v4
72+
uses: actions/download-artifact@v8
7373
with:
7474
name: package
7575

‎.gitignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ ojo/
4444
log
4545
.*~
4646
*.dst
47+
.history
4748

4849
# Gerber specs that can't be uploaded to GitHub
4950
info/Gerber/
@@ -64,4 +65,13 @@ experiments/kicad/Interposition/
6465
experiments/kicad/Plot_Layer/
6566
experiments/kicad/Print_Layer/v5_print/
6667
experiments/pcbdraw-mask/
68+
experiments/heatsink/
69+
experiments/jobset_test/
70+
experiments/kicad/10.0/
71+
experiments/kicad/Plot_Layer_CLI/
72+
experiments/kicad/Plotter_code/
73+
experiments/kicad/Sketch_Pads/
6774

75+
tests/.config/kicad/
76+
DONACIONES
77+
IMPORTANTE

0 commit comments

Comments
 (0)