Merge branch 'main' into devel

# Conflicts: # .devcontainer/build_wheel_3_10_aarch64/devcontainer.json # .devcontainer/build_wheel_3_11_aarch64/devcontainer.json # .devcontainer/build_wheel_3_12_aarch64/devcontainer.json # .devcontainer/build_wheel_3_8_aarch64/devcontainer.json # .devcontainer/build_wheel_3_9_aarch64/devcontainer.json
cnr-isti-vclab · Sep 20, 2024 · 993e744 · 993e744
2 parents 247b59a + 0e9c9c8
commit 993e744
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.devcontainer/build_wheel_3_10_aarch64/devcontainer.json b/.devcontainer/build_wheel_3_10_aarch64/devcontainer.json
@@ -2,7 +2,7 @@
     "name": "PyMeshLab aarch64 wheel for Python 3.10",
 
     "build": {
-        "dockerfile": "../Dockerfile_x86_64",
+        "dockerfile": "../Dockerfile_aarch64",
         "args": {
             "PYTHON_VERSION": "3.10"
         }

diff --git a/.devcontainer/build_wheel_3_11_aarch64/devcontainer.json b/.devcontainer/build_wheel_3_11_aarch64/devcontainer.json
@@ -2,7 +2,7 @@
     "name": "PyMeshLab aarch64 wheel for Python 3.11",
 
     "build": {
-        "dockerfile": "../Dockerfile_x86_64",
+        "dockerfile": "../Dockerfile_aarch64",
         "args": {
             "PYTHON_VERSION": "3.11"
         }

diff --git a/.devcontainer/build_wheel_3_12_aarch64/devcontainer.json b/.devcontainer/build_wheel_3_12_aarch64/devcontainer.json
@@ -2,7 +2,7 @@
     "name": "PyMeshLab aarch64 wheel for Python 3.12",
 
     "build": {
-        "dockerfile": "../Dockerfile_x86_64",
+        "dockerfile": "../Dockerfile_aarch64",
         "args": {
             "PYTHON_VERSION": "3.12"
         }

diff --git a/.devcontainer/build_wheel_3_8_aarch64/devcontainer.json b/.devcontainer/build_wheel_3_8_aarch64/devcontainer.json
@@ -2,7 +2,7 @@
     "name": "PyMeshLab aarch64 wheel for Python 3.8",
 
     "build": {
-        "dockerfile": "../Dockerfile_x86_64",
+        "dockerfile": "../Dockerfile_aarch64",
         "args": {
             "PYTHON_VERSION": "3.8"
         }

diff --git a/.devcontainer/build_wheel_3_9_aarch64/devcontainer.json b/.devcontainer/build_wheel_3_9_aarch64/devcontainer.json
@@ -2,7 +2,7 @@
     "name": "PyMeshLab aarch64 wheel for Python 3.9",
 
     "build": {
-        "dockerfile": "../Dockerfile_x86_64",
+        "dockerfile": "../Dockerfile_aarch64",
         "args": {
             "PYTHON_VERSION": "3.9"
         }