fix(ci): Remove automation to initialize Docker on Mac #28352
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Docker has been doing all that is possible to prevent installing Docker Desktop without user interaction, thus, we can't run `sentry devservices up`. See docker/for-mac#2359 (comment) for details. This PR removes all code that at times had managed to automate the process on Mac. We will rely on Ubuntu to test the `make bootstrap` path. We also add caching for Brew.
|
TODO:
|
armenzg
commented
Sep 1, 2021
| @@ -3,6 +3,7 @@ on: | |||
| pull_request: | |||
| paths: | |||
| - 'Makefile' | |||
| - '.github/actions/*' | |||
There was a problem hiding this comment.
Since we depend on actions, we should schedule this workflow when it changes.
| run: | | ||
| echo "::set-output name=python-version::$(SENTRY_NO_VENV_CHECK=1 ./scripts/do.sh get-pyenv-version)" | ||
| echo "::set-output name=pip-cache-dir::$(pip3 cache dir)" | ||
| echo "::set-output name=pip-version::$(pip -V | awk -F ' ' '{print $2}')" |
There was a problem hiding this comment.
These are not necessary because the local action setup-python now takes care of it.
|
|
||
| - name: Cache (pyenv) | ||
| uses: actions/cache@v2 | ||
| with: | ||
| path: ~/.pyenv | ||
| key: devenv-${{ matrix.os }}-pyenv-${{ hashFiles('.python-version') }} | ||
|
|
||
| - name: Cache (pip) |
There was a problem hiding this comment.
This is not necessary because the local action setup-python now takes care of it.
| @@ -83,9 +74,10 @@ jobs: | |||
| eval "$(pyenv init --path)" | |||
| python -m venv .venv | |||
| source .venv/bin/activate | |||
| make bootstrap | |||
| make develop init-config | |||
There was a problem hiding this comment.
Since we can't get Docker properly initialized we will go back to what we used to have.
| uses: ./.github/actions/setup-python | ||
| with: | ||
| # XXX: We need to pass this python-deps-${{ matrix.os }}-py${{ matrix.python-version }}-${{ hashFiles('requirements-*.txt') }} | ||
| cache-files-hash: ${{ hashFiles('requirements-*.txt') }} |
There was a problem hiding this comment.
We should be fine using the default cache key.
|
⚰️ |
🤣 |
armenzg
commented
Sep 2, 2021
| @@ -83,9 +75,4 @@ jobs: | |||
| eval "$(pyenv init --path)" | |||
| python -m venv .venv | |||
| source .venv/bin/activate | |||
| make bootstrap | |||
|
|
|||
| - name: Test direnv | |||
There was a problem hiding this comment.
Removing this as it does not seem to execute. I wonder if it ever did.
armenzg
added a commit
that referenced
this pull request
Sep 10, 2021
This is a regression from PR #28352 since the cache for Python deps did not bust, thus, it used the wheel from the cache (`xmlsec-1.3.11-cp36-cp36m-macosx_10_14_x86_64.whl`). `xmlsec` does not produce wheels for Mac.
armenzg
added a commit
that referenced
this pull request
Sep 10, 2021
This is a regression from PR #28352 since the cache for Python deps did not bust, thus, it used the wheel from the cache (`xmlsec-1.3.11-cp36-cp36m-macosx_10_14_x86_64.whl`). `xmlsec` does not produce wheels for Mac.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Docker has been doing all that is possible to prevent installing Docker Desktop
without user interaction, thus, we can't run
sentry devservices up.See docker/for-mac#2359 (comment) for details.
This PR removes all code that at times had managed to automate the process on Mac.
We will rely on Ubuntu to test the
make bootstrappath.We also add caching for Brew.