Skip to content

Commit 6a22486

Browse files
committed
Merge branch 'vherremi/commitSHAUpdate' of https://github.com/Miqueasher/aws-otel-python-instrumentation into vherremi/commitSHAUpdate
2 parents f91570e + 6bb2f25 commit 6a22486

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

.github/workflows/daily-scan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
id: high_scan
9696
uses: ./.github/actions/image_scan
9797
with:
98-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-python:v0.12.0"
98+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-python:v0.12.1"
9999
severity: 'CRITICAL,HIGH'
100100
logout: 'false'
101101

@@ -104,7 +104,7 @@ jobs:
104104
id: low_scan
105105
uses: ./.github/actions/image_scan
106106
with:
107-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-python:v0.12.0"
107+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-python:v0.12.1"
108108
severity: 'MEDIUM,LOW,UNKNOWN'
109109
logout: 'false'
110110

.github/workflows/post-release-version-bump.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,5 +144,5 @@ jobs:
144144
git add CHANGELOG.md
145145
if ! git diff --quiet --cached; then
146146
git commit -m "Force our CHANGELOG to override merge conflicts"
147-
git push origin "post-release-${VERSION}"
147+
git push origin "prepare-main-for-next-dev-cycle-${VERSION}"
148148
fi

.github/workflows/pr-build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: Python Instrumentation PR Build
22
on:
33
pull_request:
4+
types:
5+
- opened
6+
- reopened
7+
- synchronize
8+
- labeled
9+
- unlabeled
410
branches:
511
- main
612
- "release/v*"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
__version__ = "0.12.0.dev0"
4+
__version__ = "0.12.1.dev0"

0 commit comments

Comments
 (0)