Skip to content

Commit c6d1d59

Browse files
committed
Merge branch 'develop' into apm-test-k2-integration
2 parents 99c3b77 + 8855f61 commit c6d1d59

File tree

96 files changed

+7741
-859
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+7741
-859
lines changed

.github/mergify.yml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,9 @@
11
# For condition grammar see: https://docs.mergify.com/conditions/#grammar
22

3-
shared:
4-
conditions:
5-
- and: &pr_ready_checks
6-
- "#approved-reviews-by>=1" # A '#' pulls the length of the underlying list
7-
- "label=ready-to-merge"
8-
- "check-success=tests"
9-
- "-draft" # Don't include draft PRs
10-
- "-merged"
11-
- or: # Only handle branches that target main or develop branches
12-
- "base=main"
13-
- "base~=^develop"
14-
15-
queue_rules:
16-
- name: default
17-
conditions:
18-
- and: *pr_ready_checks
19-
merge_method: squash
20-
213
pull_request_rules:
22-
# Merge Queue PR Rules
23-
- name: Regular PRs - Add to merge queue on approval (squash)
24-
conditions:
25-
- and: *pr_ready_checks
26-
- "-head~=^develop" # Don't include PRs from develop branches
27-
actions:
28-
queue:
29-
method: squash
30-
314
# Automatic PR Updates
325
- name: Automatic PR branch updates
336
conditions:
34-
- "queue-position=-1" # Not queued
357
- "-draft" # Don't include draft PRs
368
- "-merged"
379
actions:

.github/workflows/build-ci-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ concurrency:
2323

2424
jobs:
2525
build:
26-
runs-on: ubuntu-latest
26+
runs-on: ubuntu-22.04
2727

2828
steps:
2929
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1

.github/workflows/deploy-python.yml

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ on:
2121

2222
jobs:
2323
build-linux-py3-legacy:
24-
runs-on: ubuntu-latest
24+
runs-on: ubuntu-22.04
2525
strategy:
26+
fail-fast: false
2627
matrix:
2728
wheel:
2829
- cp37-manylinux
@@ -35,7 +36,7 @@ jobs:
3536
fetch-depth: 0
3637

3738
- name: Setup QEMU
38-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # 3.0.0
39+
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # 3.3.0
3940

4041
- name: Build Wheels
4142
uses: pypa/cibuildwheel@8d945475ac4b1aac4ae08b2fd27db9917158b6ce # 2.17.0
@@ -55,8 +56,9 @@ jobs:
5556
retention-days: 1
5657

5758
build-linux-py3:
58-
runs-on: ubuntu-latest
59+
runs-on: ubuntu-22.04
5960
strategy:
61+
fail-fast: false
6062
matrix:
6163
wheel:
6264
- cp38-manylinux
@@ -79,10 +81,10 @@ jobs:
7981
fetch-depth: 0
8082

8183
- name: Setup QEMU
82-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # 3.0.0
84+
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # 3.3.0
8385

8486
- name: Build Wheels
85-
uses: pypa/cibuildwheel@d4a2945fcc8d13f20a1b99d461b8e844d5fc6e23 # 2.21.1
87+
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # 2.22.0
8688
env:
8789
CIBW_PLATFORM: linux
8890
CIBW_BUILD: "${{ matrix.wheel }}*"
@@ -99,7 +101,7 @@ jobs:
99101
retention-days: 1
100102

101103
build-sdist:
102-
runs-on: ubuntu-latest
104+
runs-on: ubuntu-22.04
103105
steps:
104106
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1
105107
with:
@@ -131,7 +133,7 @@ jobs:
131133
retention-days: 1
132134

133135
deploy:
134-
runs-on: ubuntu-latest
136+
runs-on: ubuntu-22.04
135137

136138
needs:
137139
- build-linux-py3-legacy
@@ -182,3 +184,16 @@ jobs:
182184
env:
183185
TWINE_USERNAME: __token__
184186
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
187+
188+
- name: Create release tags for Lambda and K8s Init Containers
189+
run: |
190+
RELEASE_TITLE="New Relic Python Agent ${GITHUB_REF_NAME}.0"
191+
RELEASE_TAG="${GITHUB_REF_NAME}.0_python"
192+
RELEASE_NOTES="Automated release for [Python Agent ${GITHUB_REF_NAME}](https://github.com/newrelic/newrelic-python-agent/releases/tag/${GITHUB_REF_NAME})"
193+
gh auth login --with-token <<< $GH_RELEASE_TOKEN
194+
echo "newrelic/newrelic-lambda-layers - Releasing \"${RELEASE_TITLE}\" with tag ${RELEASE_TAG}"
195+
gh release create "${RELEASE_TAG}" --title="${RELEASE_TITLE}" --repo=newrelic/newrelic-lambda-layers --notes="${RELEASE_NOTES}"
196+
echo "newrelic/newrelic-agent-init-container - Releasing \"${RELEASE_TITLE}\" with tag ${RELEASE_TAG}"
197+
gh release create "${RELEASE_TAG}" --title="${RELEASE_TITLE}" --repo=newrelic/newrelic-agent-init-container --notes="${RELEASE_NOTES}"
198+
env:
199+
GH_RELEASE_TOKEN: ${{ secrets.GH_RELEASE_TOKEN }}

.github/workflows/mega-linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ concurrency:
2121
jobs:
2222
build:
2323
name: Mega-Linter
24-
runs-on: ubuntu-latest
24+
runs-on: ubuntu-22.04
2525
steps:
2626
# Git Checkout
2727
- name: Checkout Code

0 commit comments

Comments
 (0)