Merge pull request #344 from tienvx/use-arm-container

Use arm container
pact-foundation · Oct 12, 2023 · 4d61608 · 4d61608
2 parents 2494e67 + ffc0443
commit 4d61608
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -24,10 +24,10 @@ linux_arm64_task:
       - VERSION: 8.2
       - VERSION: 8.1
       - VERSION: 8.0
-  container:
+  arm_container:
     image: php:$VERSION
   pre_req_script: 
-      - apt update --yes && apt install --yes zip unzip git libffi-dev shared-mime-info
+      - apt update --yes && apt install --yes zip unzip git libffi-dev
       - curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php
       - php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer
       - docker-php-ext-install sockets
@@ -46,7 +46,7 @@ macos_arm64_task:
   macos_instance:
     image: ghcr.io/cirruslabs/macos-ventura-base:latest
   pre_req_script: 
-      - brew install php@$VERSION composer shared-mime-info
+      - brew install php@$VERSION composer
   version_check_script: 
       - php --version
   << : *BUILD_TEST_TASK_TEMPLATE
diff --git a/example/binary/consumer/tests/Service/HttpClientServiceTest.php b/example/binary/consumer/tests/Service/HttpClientServiceTest.php
@@ -26,7 +26,7 @@ public function testGetImageContent()
         $response
             ->setStatus(200)
             ->addHeader('Content-Type', 'image/jpeg')
-            ->setBody(new Binary($imageContent, in_array(php_uname('m'), ['AMD64', 'arm64']) ? 'application/octet-stream' : 'image/jpeg'));
+            ->setBody(new Binary($imageContent, in_array(php_uname('m'), ['AMD64', 'arm64', 'aarch64']) ? 'application/octet-stream' : 'image/jpeg'));
 
         $config = new MockServerConfig();
         $config

diff --git a/example/multipart/consumer/tests/Service/HttpClientServiceTest.php b/example/multipart/consumer/tests/Service/HttpClientServiceTest.php
@@ -36,7 +36,7 @@ public function testUpdateUserProfile()
             ->setBody(new Multipart(
                 [
                     new Part(__DIR__ . '/../_resource/full_name.txt', 'full_name', 'text/plain'),
-                    new Part(__DIR__ . '/../_resource/image.jpg', 'profile_image', in_array(php_uname('m'), ['AMD64', 'arm64']) ? 'application/octet-stream' : 'image/jpeg'),
+                    new Part(__DIR__ . '/../_resource/image.jpg', 'profile_image', in_array(php_uname('m'), ['AMD64', 'arm64', 'aarch64']) ? 'application/octet-stream' : 'image/jpeg'),
                     new Part(__DIR__ . '/../_resource/note.txt', 'personal_note', 'text/plain'),
                 ],
                 'ktJmeYHbkTSa1jxD'