[docker] Update DART version to 6.15

dartsim · Jul 6, 2024 · 44b57a4 · 44b57a4
1 parent 54a1a32
commit 44b57a4
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 23 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,2 +1,2 @@
-FROM jslee02/dart-dev:ubuntu-jammy-v6.14
+FROM jslee02/dart-dev:ubuntu-jammy-v6.15
 
diff --git a/.github/workflows/cache_docker.yml b/.github/workflows/cache_docker.yml
@@ -30,7 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         distro: [jammy, noble, oracular]
-        dart_version: [v6.14]
+        dart_version: [v6.15]
         platforms: ["linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"]
         build_min: [OFF]
     env:
@@ -82,28 +82,28 @@ jobs:
         base_image: [quay.io/pypa/manylinux_2_28_x86_64]
         image: [manylinux_2_28_x86_64]
         platforms: ["linux/amd64"]
-        dart_version: [v6.14]
+        dart_version: [v6.15]
         experimental: [false]
         include:
           - dockerfile: Dockerfile.manylinux_2_28_aarch64-min
             base_image: quay.io/pypa/manylinux_2_28_aarch64
             image: manylinux_2_28_aarch64-min
             platforms: "linux/arm64"
-            dart_version: v6.14
+            dart_version: v6.15
             experimental: false
 
           - dockerfile: Dockerfile.manylinux_2_28_ppc64le-min
             base_image: quay.io/pypa/manylinux_2_28_ppc64le
             image: manylinux_2_28_ppc64le-min
             platforms: "linux/ppc64le"
-            dart_version: v6.14
+            dart_version: v6.15
             experimental: false
 
           - dockerfile: Dockerfile.manylinux_2_28_s390x-min
             base_image: quay.io/pypa/manylinux_2_28_s390x
             image: manylinux_2_28_s390x-min
             platforms: "linux/s390x"
-            dart_version: v6.14
+            dart_version: v6.15
             experimental: false
     steps:
       # https://github.com/marketplace/actions/docker-setup-qemu
@@ -141,24 +141,24 @@ jobs:
       fail-fast: false
       matrix:
         dockerfile: [Dockerfile.manylinux_2_28_aarch64]
-        base_image: ["jslee02/dart-dev:manylinux_2_28_aarch64-min-v6.14"]
+        base_image: ["jslee02/dart-dev:manylinux_2_28_aarch64-min-v6.15"]
         image: [manylinux_2_28_aarch64]
         platforms: ["linux/arm64"]
-        dart_version: [v6.14]
+        dart_version: [v6.15]
         experimental: [false]
         include:
           - dockerfile: Dockerfile.manylinux_2_28_ppc64le
-            base_image: jslee02/dart-dev:manylinux_2_28_ppc64le-min-v6.14
+            base_image: jslee02/dart-dev:manylinux_2_28_ppc64le-min-v6.15
             image: manylinux_2_28_ppc64le
             platforms: "linux/ppc64le"
-            dart_version: v6.14
+            dart_version: v6.15
             experimental: false
 
           - dockerfile: Dockerfile.manylinux_2_28_s390x
-            base_image: jslee02/dart-dev:manylinux_2_28_s390x-min-v6.14
+            base_image: jslee02/dart-dev:manylinux_2_28_s390x-min-v6.15
             image: manylinux_2_28_s390x
             platforms: "linux/s390x"
-            dart_version: v6.14
+            dart_version: v6.15
             experimental: false
     steps:
       # https://github.com/marketplace/actions/docker-setup-qemu
@@ -193,7 +193,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dart_version: [v6.14]
+        dart_version: [v6.15]
         build_min: [ON]
     env:
       OS_VERSION: tracy

diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml
@@ -46,7 +46,7 @@ jobs:
     env:
       # Hosted on: https://hub.docker.com/repository/docker/jslee02/dart-dev
       DART_DEV_IMAGE: jslee02/dart-dev
-      DOCKER_TAG: ${{ matrix.os }}-v6.14
+      DOCKER_TAG: ${{ matrix.os }}-v6.15
       PLATFORM: linux/amd64
       COMPILER: gcc
       BUILD_TYPE: ${{ matrix.build_type }}

diff --git a/...v/v6.14/Dockerfile.manylinux_2_28_aarch64 → ...v/v6.15/Dockerfile.manylinux_2_28_aarch64 b/...v/v6.14/Dockerfile.manylinux_2_28_aarch64 → ...v/v6.15/Dockerfile.manylinux_2_28_aarch64
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=jslee02/dart-dev:manylinux_2_28_aarch64-min-v6.14
+ARG BASE_IMAGE=jslee02/dart-dev:manylinux_2_28_aarch64-min-v6.15
 FROM $BASE_IMAGE
 
 ARG NUM_CORES=14

diff --git a/....14/Dockerfile.manylinux_2_28_aarch64-min → ....15/Dockerfile.manylinux_2_28_aarch64-min b/....14/Dockerfile.manylinux_2_28_aarch64-min → ....15/Dockerfile.manylinux_2_28_aarch64-min
diff --git a/...v/v6.14/Dockerfile.manylinux_2_28_ppc64le → ...v/v6.15/Dockerfile.manylinux_2_28_ppc64le b/...v/v6.14/Dockerfile.manylinux_2_28_ppc64le → ...v/v6.15/Dockerfile.manylinux_2_28_ppc64le
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=jslee02/dart-dev:manylinux_2_28_ppc64le-min-v6.14
+ARG BASE_IMAGE=jslee02/dart-dev:manylinux_2_28_ppc64le-min-v6.15
 FROM $BASE_IMAGE
 
 ARG NUM_CORES=14

diff --git a/....14/Dockerfile.manylinux_2_28_ppc64le-min → ....15/Dockerfile.manylinux_2_28_ppc64le-min b/....14/Dockerfile.manylinux_2_28_ppc64le-min → ....15/Dockerfile.manylinux_2_28_ppc64le-min
diff --git a/...dev/v6.14/Dockerfile.manylinux_2_28_s390x → ...dev/v6.15/Dockerfile.manylinux_2_28_s390x b/...dev/v6.14/Dockerfile.manylinux_2_28_s390x → ...dev/v6.15/Dockerfile.manylinux_2_28_s390x
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=jslee02/dart-dev:manylinux_2_28_s390x-min-v6.14
+ARG BASE_IMAGE=jslee02/dart-dev:manylinux_2_28_s390x-min-v6.15
 FROM $BASE_IMAGE
 
 ARG NUM_CORES=14

diff --git a/...v6.14/Dockerfile.manylinux_2_28_s390x-min → ...v6.15/Dockerfile.manylinux_2_28_s390x-min b/...v6.14/Dockerfile.manylinux_2_28_s390x-min → ...v6.15/Dockerfile.manylinux_2_28_s390x-min
diff --git a/...ev/v6.14/Dockerfile.manylinux_2_28_x86_64 → ...ev/v6.15/Dockerfile.manylinux_2_28_x86_64 b/...ev/v6.14/Dockerfile.manylinux_2_28_x86_64 → ...ev/v6.15/Dockerfile.manylinux_2_28_x86_64
diff --git a/docker/dev/v6.14/Dockerfile.tracy → docker/dev/v6.15/Dockerfile.tracy b/docker/dev/v6.14/Dockerfile.tracy → docker/dev/v6.15/Dockerfile.tracy
diff --git a/docker/dev/v6.14/Dockerfile.ubuntu.jammy → docker/dev/v6.15/Dockerfile.ubuntu.jammy b/docker/dev/v6.14/Dockerfile.ubuntu.jammy → docker/dev/v6.15/Dockerfile.ubuntu.jammy
diff --git a/docker/dev/v6.14/Dockerfile.ubuntu.noble → docker/dev/v6.15/Dockerfile.ubuntu.noble b/docker/dev/v6.14/Dockerfile.ubuntu.noble → docker/dev/v6.15/Dockerfile.ubuntu.noble
diff --git a/docker/dev/v6.14/Dockerfile.ubuntu.oracular → docker/dev/v6.15/Dockerfile.ubuntu.oracular b/docker/dev/v6.14/Dockerfile.ubuntu.oracular → docker/dev/v6.15/Dockerfile.ubuntu.oracular
diff --git a/pyproject.toml b/pyproject.toml
@@ -33,10 +33,10 @@ testpaths = ["tests"]
 
 # https://cibuildwheel.readthedocs.io/en/stable/options/#before-all
 [tool.cibuildwheel]
-manylinux-x86_64-image = "jslee02/dart-dev:manylinux_2_28_x86_64-v6.14"
-manylinux-aarch64-image = "jslee02/dart-dev:manylinux_2_28_aarch64-v6.14"
-manylinux-pypy_x86_64-image = "jslee02/dart-dev:manylinux_2_28_x86_64-v6.14"
-manylinux-pypy_aarch64-image = "jslee02/dart-dev:manylinux_2_28_aarch64-v6.14"
+manylinux-x86_64-image = "jslee02/dart-dev:manylinux_2_28_x86_64-v6.15"
+manylinux-aarch64-image = "jslee02/dart-dev:manylinux_2_28_aarch64-v6.15"
+manylinux-pypy_x86_64-image = "jslee02/dart-dev:manylinux_2_28_x86_64-v6.15"
+manylinux-pypy_aarch64-image = "jslee02/dart-dev:manylinux_2_28_aarch64-v6.15"
 test-requires = "pytest"
 test-command = "pytest {project}/python/tests"
 # https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip

diff --git a/scripts/run b/scripts/run
@@ -7,7 +7,7 @@ script_path="$(
 )"
 
 os=ubuntu-focal
-dart_version=v6.14
+dart_version=v6.15
 build_dir_prefix=.build/
 project_dir=/opt/dart/
 cleanup_command=""
@@ -34,7 +34,7 @@ help() {
 
   Options:
     -o <name>       OS version. Available <name>: {ubuntu-bionic, ubuntu-focal (default), ubuntu-impish}
-    -v <version>    DART version. Available <version>: {v6.14 (default)}
+    -v <version>    DART version. Available <version>: {v6.15 (default)}
     -c              Clean build. Empty the build directory before building.
     -j <num_cores>  Number of cores to use for build. Use -j 1 to disable parallel build. Single core will be used if this option is not specified.
     --dev           Use Docker image for development rather than release image.
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		FROM jslee02/dart-dev:ubuntu-jammy-v6.14
		FROM jslee02/dart-dev:ubuntu-jammy-v6.15