Skip to content

Commit cbd6928

Browse files
authored
Simplify code by removing chown and chmod (#279)
2 parents 783ba76 + 83a526a commit cbd6928

1 file changed

Lines changed: 4 additions & 14 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,21 @@ jobs:
6969
else
7070
git submodule update --remote Pillow
7171
fi
72-
(cd Pillow && git checkout main)
73-
sudo chown -R 1001 "$(pwd)"
72+
cd Pillow && git checkout main
7473
7574
- name: Test Image Build
7675
if: "matrix.test-image"
7776
run: |
7877
cd "${{ matrix.test-image }}"
79-
make pull || (sudo chmod a+w . && make update && make build BRANCH=main)
78+
make pull || (make update && make build BRANCH=main)
8079
env:
8180
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
8281
DOCKER_ARGS: ${{ matrix.docker-args }}
8382

8483
- name: Build image
8584
id: build
8685
run: |
87-
cd "${{ matrix.image }}" && sudo chmod a+w . && make update
86+
cd "${{ matrix.image }}" && make update
8887
if [[ -n "$DOCKER_USERNAME" ]]; then
8988
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin && echo "logged_in=true" >> "$GITHUB_OUTPUT"
9089
fi
@@ -113,10 +112,6 @@ jobs:
113112
env:
114113
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
115114

116-
- name: Post build
117-
if: always()
118-
run: sudo chown -R "$(id -u)" "$(pwd)"
119-
120115
# The valgrind suite is slow, so build its image once, test it across
121116
# parallel split jobs, and push only after every split has passed.
122117
build-valgrind:
@@ -176,8 +171,7 @@ jobs:
176171
- name: Prepare test
177172
run: |
178173
git submodule update --remote Pillow
179-
(cd Pillow && git checkout main)
180-
sudo chown -R 1001 "$(pwd)"
174+
cd Pillow && git checkout main
181175
182176
- name: Load image
183177
run: |
@@ -197,10 +191,6 @@ jobs:
197191
SPLIT_INDEX: ${{ matrix.split }}
198192
SPLIT_COUNT: ${{ strategy.job-total }}
199193

200-
- name: Post test
201-
if: always()
202-
run: sudo chown -R "$(id -u)" "$(pwd)"
203-
204194
push-valgrind:
205195
name: Push ubuntu-24.04-noble-amd64-valgrind
206196
needs: test-valgrind

0 commit comments

Comments
 (0)