Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,21 @@ 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 }}

- 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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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: |
Expand All @@ -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
Expand Down
Loading