Update to newer machine images on CI

DigitalSlideArchive · Dec 3, 2024 · 91d5871 · 91d5871
1 parent 2cf962c
commit 91d5871
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -42,9 +42,14 @@ commands:
       - run:
           name: Upgrade pyenv
           command: |
-            rm -rf /opt/circleci/.pyenv
-            curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
+            sudo rm -rf /opt/circleci/.pyenv
+            sudo bash -c 'curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | PYENV_ROOT=/opt/circleci/.pyenv bash'
+            sudo chmod -R 777 /opt/circleci/.pyenv/
             pyenv install --list list
+      - run:
+          name: Use pyenv to install python
+          command: |
+            pyenv install -s << parameters.version >>
       - run:
           name: Use pyenv to install python
           command: |
@@ -66,7 +71,7 @@ jobs:
   py39:
     working_directory: ~/project
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2204:current
     steps:
       - checkout
       - upgradepython:
@@ -92,7 +97,7 @@ jobs:
   py310:
     working_directory: ~/project
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2204:current
     steps:
       - checkout
       - upgradepython:
@@ -118,7 +123,7 @@ jobs:
   py311:
     working_directory: ~/project
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2204:current
     steps:
       - checkout
       - upgradepython:
@@ -144,7 +149,7 @@ jobs:
   py312:
     working_directory: ~/project
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2204:current
     steps:
       - checkout
       - upgradepython:
@@ -186,7 +191,7 @@ jobs:
   docker:
     working_directory: ~/project
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2204:current
     steps:
       - checkout
       - run:
@@ -218,7 +223,7 @@ jobs:
   publish_docker:
     working_directory: ~/project
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2204:current
     steps:
       - checkout
       - attach_workspace:
@@ -238,12 +243,11 @@ jobs:
               fi
   wheels:
     working_directory: ~/project
-    docker:
-      - image: cimg/python:3.9
-      - image: docker:git
+    machine:
+      image: ubuntu-2204:current
     steps:
       - checkout
-      - setup_remote_docker
+      # - setup_remote_docker
       - run:
           name: Setup virtual environment
           command: |

diff --git a/Dockerfile-wheels b/Dockerfile-wheels
@@ -1,4 +1,4 @@
-FROM dockcross/manylinux2014-x64
+FROM dockcross/manylinux_2_28-x64
 
 # Don't build python < 3.9
 RUN rm -rf /opt/python/cp36*