Sync 6.x with main at 6.22.2 #2049
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
…ic#2026) Create a PR from a branch already rebased so that the commit list in the github UI is clean.
…... (elastic#2028) ... 3ffa7e1 Made with ❤️️ by updatecli Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
As for some reason latest 8.4.0 is not working.
…lastic#2034) * build(deps): bump jinja2 from 3.0.3 to 3.1.4 in /tests/requirements Bumps [jinja2](https://github.com/pallets/jinja) from 3.0.3 to 3.1.4. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](pallets/jinja@3.0.3...3.1.4) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Update tests/requirements/reqs-jinja2-2.txt --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Unfortunately flask 1.0 does not work with jinja 3.1.x:
venv/lib/python3.10/site-packages/flask/__init__.py:19: in <module>
from jinja2 import Markup, escape
E ImportError: cannot import name 'Markup' from 'jinja2'
It's always available since 3.2 and tests are already assuming that.
Hopefully fix:
The lambda layer can be published as follows for dev work:
aws lambda --output json publish-layer-version --layer-name 'runner-dev-elastic-apm-python' --description 'runner dev Elastic APM Python agent lambda layer' --zip-file 'fileb://build/dist/elastic-apm-python-lambda-layer.zip'
Run actions/upload-artifact@v4
with:
name: build-distribution
path: ./build/
if-no-files-found: error
compression-level: 6
overwrite: false
env:
...
With the provided path, there will be 636 files uploaded
Artifact name is valid!
Root directory input is valid!
Error: Failed to CreateArtifact: Received non-retryable error: Failed request: (409) Conflict: an artifact with this name already exists on the workflow run
basepi
approved these changes
May 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.