Skip to content

Commit

Permalink
Fix sherlock workflow again (#5788)
Browse files Browse the repository at this point in the history
**What's the problem this PR addresses?**
<!-- Describe the rationale of your PR. -->
<!-- Link all issues that it closes. (Closes/Resolves #xxxx.) -->

After upgrading alpine for the sherlock workflow in #5718, the workflow
still fails due to newer versions of alpine no longer having the
`python2` package.

Fixes #5709

**How did you fix it?**
<!-- A detailed description of your implementation. -->

Since we removed the old website in #5742, berry no longer depends on
`sharp` so I just removed all the alpine packages needed to build
`sharp` including `python2`

**Checklist**
<!--- Don't worry if you miss something, chores are automatically
tested. -->
<!--- This checklist exists to help you remember doing the chores when
you submit a PR. -->
<!--- Put an `x` in all the boxes that apply. -->
- [x] I have read the [Contributing
Guide](https://yarnpkg.com/advanced/contributing).

<!-- See
https://yarnpkg.com/advanced/contributing#preparing-your-pr-to-be-released
for more details. -->
<!-- Check with `yarn version check` and fix with `yarn version check
-i` -->
- [x] I have set the packages that need to be released for my changes to
be effective.

<!-- The "Testing chores" workflow validates that your PR follows our
guidelines. -->
<!-- If it doesn't pass, click on it to see details as to what your PR
might be missing. -->
- [x] I will check that all automated PR checks pass before the PR gets
reviewed.

Co-authored-by: Maël Nison <[email protected]>
  • Loading branch information
clemyan and arcanis authored Oct 18, 2023
1 parent 3bf4541 commit 77d7306
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
5 changes: 0 additions & 5 deletions scripts/actions/local-yarn-command/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,5 @@ LABEL "com.github.actions.color"="blue"

RUN apk add --no-cache bash nodejs rsync git

# For building Sharp
RUN apk add fftw-dev build-base autoconf python2 imagemagick --update-cache \
--repository https://alpine.global.ssl.fastly.net/alpine/edge/testing/ \
--repository https://alpine.global.ssl.fastly.net/alpine/edge/main

ADD entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
3 changes: 0 additions & 3 deletions scripts/actions/local-yarn-command/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,4 @@
set -e
echo

# The version of libvips available on alpine doesn't support svg
export SHARP_IGNORE_GLOBAL_LIBVIPS=1

exec node ./scripts/run-yarn.js "$@"

0 comments on commit 77d7306

Please sign in to comment.