Update KiCad version

adamws · Sep 8, 2024 · 410f181 · 410f181
1 parent 8249df6
commit 410f181
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -160,6 +160,9 @@ jobs:
             elif [ "<<parameters.kicad-version>>" = "8.0.4" ]; then
               revision=ced7b59ba78c908ee102ce8ea98387d4a116bef8
               filepath=Casks/k/kicad.rb
+            elif [ "<<parameters.kicad-version>>" = "8.0.5" ]; then
+              revision=4768a8d71b0870452f9262a117defc66fb3799fa
+              filepath=Casks/k/kicad.rb
             else
               echo "Unsupported KiCad version!"
             fi
@@ -351,13 +354,13 @@ workflows:
                 - 7.0.6-lunar
                 - 7.0.11-focal
                 - 7.0.11-mantic
-                - 8.0.4-focal
-                - 8.0.4-jammy
+                - 8.0.5-focal
+                - 8.0.5-jammy
       - test-linux-performance:
           matrix:
             parameters:
               version:
-                - 8.0.4-jammy
+                - 8.0.5-jammy
       - collect-coverage:
           requires:
             - test-linux
@@ -370,13 +373,13 @@ workflows:
               kicad-version:
                 - 6.0.11
                 - 7.0.11
-                - 8.0.4
+                - 8.0.5
       - test-macos:
           matrix:
             parameters:
               kicad-version:
                 - 7.0.11
-                - 8.0.4
+                - 8.0.5
       - create-pcm-package:
           requires: &required-tests
             - test-linux

diff --git a/.circleci/images/build.sh b/.circleci/images/build.sh
@@ -14,5 +14,5 @@ build_and_push() {
   docker push admwscki/kicad-kbplacer-primary:$1
 }
 
-build_and_push 8.0.4-focal focal/kicad8.Dockerfile
-build_and_push 8.0.4-jammy jammy/kicad8.Dockerfile
+build_and_push 8.0.5-focal focal/kicad8.Dockerfile
+build_and_push 8.0.5-jammy jammy/kicad8.Dockerfile
diff --git a/.circleci/images/focal/kicad8.Dockerfile b/.circleci/images/focal/kicad8.Dockerfile
@@ -22,16 +22,16 @@ RUN apt-get update \
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen \
   && locale-gen
 
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
 
 RUN add-apt-repository --yes ppa:kicad/kicad-8.0-releases \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
-     kicad=8.0.4-0~ubuntu20.04.1 \
-     kicad-footprints=8.0.4~ubuntu20.04.1 \
-     kicad-symbols=8.0.4~ubuntu20.04.1 \
+     kicad=8.0.5-0~ubuntu20.04.1 \
+     kicad-footprints=8.0.5~ubuntu20.04.1 \
+     kicad-symbols=8.0.5~ubuntu20.04.1 \
   && rm -rf /var/lib/apt/lists/*
 
-ENV PYTHONPATH "${PYTHONPATH}:/usr/lib/python3.8/site-packages"
+ENV PYTHONPATH="/usr/lib/python3.8/site-packages"
diff --git a/.circleci/images/jammy/kicad8.Dockerfile b/.circleci/images/jammy/kicad8.Dockerfile
@@ -22,18 +22,18 @@ RUN apt-get update \
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen \
   && locale-gen
 
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
 
 RUN find / -type f -name "EXTERNALLY-MANAGED" -exec rm {} \;
 
 RUN add-apt-repository --yes ppa:kicad/kicad-8.0-releases \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
-     kicad=8.0.4-0~ubuntu22.04.1 \
-     kicad-footprints=8.0.4~ubuntu22.04.1 \
-     kicad-symbols=8.0.4~ubuntu22.04.1 \
+     kicad=8.0.5-0~ubuntu22.04.1 \
+     kicad-footprints=8.0.5~ubuntu22.04.1 \
+     kicad-symbols=8.0.5~ubuntu22.04.1 \
   && rm -rf /var/lib/apt/lists/*
 
-ENV PYTHONPATH "${PYTHONPATH}:/usr/lib/python3/dist-packages"
+ENV PYTHONPATH="/usr/lib/python3/dist-packages"
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -306,7 +306,7 @@ def generate_render(
 
 
 def generate_drc(tmpdir, board_path: Union[str, os.PathLike]) -> None:
-    if KICAD_VERSION in [(8, 0, 1), (8, 0, 2), (8, 0, 3), (8, 0, 4)]:
+    if KICAD_VERSION >= (8, 0, 1):
         # there is some kind of KiCad regression, this function
         # causes assertion fail randomly, see
         # https://gitlab.com/kicad/code/kicad/-/issues/17504