diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c26fd34..3ed008db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,14 +69,13 @@ jobs: else git submodule update --remote Pillow fi - (cd Pillow && git checkout main) - sudo chown -R 1001 "$(pwd)" + cd Pillow && git checkout main - name: Test Image Build if: "matrix.test-image" run: | cd "${{ matrix.test-image }}" - make pull || (sudo chmod a+w . && make update && make build BRANCH=main) + make pull || (make update && make build BRANCH=main) env: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_ARGS: ${{ matrix.docker-args }} @@ -84,7 +83,7 @@ jobs: - name: Build image id: build run: | - cd "${{ matrix.image }}" && sudo chmod a+w . && make update + cd "${{ matrix.image }}" && make update if [[ -n "$DOCKER_USERNAME" ]]; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin && echo "logged_in=true" >> "$GITHUB_OUTPUT" fi @@ -113,10 +112,6 @@ jobs: env: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - - name: Post build - if: always() - run: sudo chown -R "$(id -u)" "$(pwd)" - # The valgrind suite is slow, so build its image once, test it across # parallel split jobs, and push only after every split has passed. build-valgrind: @@ -176,8 +171,7 @@ jobs: - name: Prepare test run: | git submodule update --remote Pillow - (cd Pillow && git checkout main) - sudo chown -R 1001 "$(pwd)" + cd Pillow && git checkout main - name: Load image run: | @@ -197,10 +191,6 @@ jobs: SPLIT_INDEX: ${{ matrix.split }} SPLIT_COUNT: ${{ strategy.job-total }} - - name: Post test - if: always() - run: sudo chown -R "$(id -u)" "$(pwd)" - push-valgrind: name: Push ubuntu-24.04-noble-amd64-valgrind needs: test-valgrind