CI: Simplify volume mappings for linuxmusl-arm64 runners

.github/workflows/ci.yml

@@ -169,7 +169,7 @@ jobs:
           path: npm/${{ matrix.platform }}
           retention-days: 1
           if-no-files-found: error
-  build-linuxmusl-arm-64:
+  build-linuxmusl-arm64:
     permissions:
       contents: read
     name: "build-linuxmusl-arm64 [Node.js ${{ matrix.nodejs_version_major }}] ${{ matrix.package && '[package]' }}"
@@ -177,7 +177,8 @@ jobs:
     container:
       image: ${{ matrix.container }}
       volumes:
-        - /:/host
+        - /opt:/opt:rw,rshared
+        - /opt:/__e/node20:ro,rshared
     strategy:
       fail-fast: false
       matrix:
@@ -191,12 +192,10 @@ jobs:
       - name: Allow Linux musl containers on ARM64 runners # https://github.com/actions/runner/issues/801#issuecomment-2394425757
         shell: sh
         run: |
-          apk add nodejs
+          sed -i "/^ID=/s/alpine/NotpineForGHA/" /etc/os-release
-          sed -i "s:ID=alpine:ID=NotpineForGHA:" /etc/os-release
+          apk add nodejs --update-cache
-          cd /host/home/runner/runners/*/externals/
+          mkdir /opt/bin
-          rm -rf node20/*
+          ln -s /usr/bin/node /opt/bin/node
-          mkdir node20/bin
-          ln -s /usr/bin/node node20/bin/node
       - name: Dependencies
         run: apk add build-base git python3 font-noto --update-cache
       - uses: actions/checkout@v4
@@ -304,7 +303,7 @@ jobs:
     runs-on: ubuntu-24.04
     needs:
       - build-native
-      - build-linuxmusl-arm-64
+      - build-linuxmusl-arm64
       - build-qemu
       - build-emscripten
     steps:

docs/src/content/docs/changelog/v0.34.4.md

@@ -0,0 +1,7 @@
+---
+title: v0.34.4 - TBD
+slug: changelog/v0.34.4
+---
+
+* Ensure `autoOrient` removes existing metadata after shrink-on-load.
+  [#4431](https://github.com/lovell/sharp/issues/4431)

src/pipeline.cc

@@ -98,7 +98,6 @@ class PipelineWorker : public Napi::AsyncWorker {
       if (baton->input->autoOrient) {
         // Rotate and flip image according to Exif orientation
         std::tie(autoRotation, autoFlip, autoFlop) = CalculateExifRotationAndFlip(sharp::ExifOrientation(image));
-        image = sharp::RemoveExifOrientation(image);
       }
 
       rotation = CalculateAngleRotation(baton->angle);
@@ -294,6 +293,9 @@ class PipelineWorker : public Napi::AsyncWorker {
           throw vips::VError("Input SVG image exceeds 32767x32767 pixel limit");
         }
       }
+      if (baton->input->autoOrient) {
+        image = sharp::RemoveExifOrientation(image);
+      }
 
       // Any pre-shrinking may already have been done
       inputWidth = image.width();

test/unit/raw.js

@@ -322,8 +322,6 @@ describe('Raw pixel data', function () {
       .gif({ keepDuplicateFrames: true })
       .toBuffer();
 
-    console.log(await sharp(gif).metadata());
-
     const { width, height, pages, delay } = await sharp(gif).metadata();
     assert.strictEqual(width, 1);
     assert.strictEqual(height, 1);

test/unit/rotate.js

@@ -635,6 +635,19 @@ describe('Rotation', function () {
     assert.strictEqual(height, 6);
   });
 
+  it('Shrink-on-load with autoOrient', async () => {
+    const data = await sharp(fixtures.inputJpgWithLandscapeExif6)
+      .resize(8)
+      .autoOrient()
+      .avif({ effort: 0 })
+      .toBuffer();
+
+    const { width, height, orientation } = await sharp(data).metadata();
+    assert.strictEqual(width, 8);
+    assert.strictEqual(height, 6);
+    assert.strictEqual(orientation, undefined);
+  });
+
   it('Invalid autoOrient throws', () =>
     assert.throws(
       () => sharp({ autoOrient: 'fail' }),