From a69528b50dfebaee040aae6ae96c062f47b2f688 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Fri, 17 May 2024 16:48:54 +0200 Subject: [PATCH 1/2] ci: use v3 artifact APIs for build-distribution (#2046) 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 --- .github/actions/build-distribution/action.yml | 2 +- .github/workflows/release.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/build-distribution/action.yml b/.github/actions/build-distribution/action.yml index bc0d55c29..05c32eeb8 100644 --- a/.github/actions/build-distribution/action.yml +++ b/.github/actions/build-distribution/action.yml @@ -14,7 +14,7 @@ runs: run: ./dev-utils/make-distribution.sh shell: bash - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 with: name: build-distribution path: ./build/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cc0de40a2..c00975d7c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -85,7 +85,7 @@ jobs: secrets: | secret/observability-team/ci/service-account/apm-agent-python access_key_id | AWS_ACCESS_KEY_ID ; secret/observability-team/ci/service-account/apm-agent-python secret_access_key | AWS_SECRET_ACCESS_KEY - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v3 with: name: build-distribution path: ./build @@ -128,7 +128,7 @@ jobs: roleId: ${{ secrets.VAULT_ROLE_ID }} secretId: ${{ secrets.VAULT_SECRET_ID }} - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v3 with: name: build-distribution path: ./build From 6056e241fd8fe7aa5e06450786f3843cf383f3a2 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Mon, 20 May 2024 10:25:02 +0200 Subject: [PATCH 2/2] update CHANGELOG and bump version to 6.22.2 (#2048) --- CHANGELOG.asciidoc | 8 ++++++++ elasticapm/version.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index cf6a99a7c..45934551a 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -32,6 +32,14 @@ endif::[] [[release-notes-6.x]] === Python Agent version 6.x +[[release-notes-6.22.2]] +==== 6.22.2 - 2024-05-20 + +[float] +===== Bug fixes + +* Fix CI release workflow {pull}2046[#2046] + [[release-notes-6.22.1]] ==== 6.22.1 - 2024-05-17 diff --git a/elasticapm/version.py b/elasticapm/version.py index e778fc5b2..9d26934f4 100644 --- a/elasticapm/version.py +++ b/elasticapm/version.py @@ -28,5 +28,5 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = (6, 22, 1) +__version__ = (6, 22, 2) VERSION = ".".join(map(str, __version__))