Skip to content

Commit bd276ca

Browse files
authored
Merge branch 'elastic:main' into main
2 parents de6d46e + 8ca7422 commit bd276ca

File tree

4 files changed

+22
-11
lines changed

4 files changed

+22
-11
lines changed

.github/workflows/labeler.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,26 @@ jobs:
1515
triage:
1616
runs-on: ubuntu-latest
1717
steps:
18+
- name: Get token
19+
id: get_token
20+
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
21+
with:
22+
app_id: ${{ secrets.OBS_AUTOMATION_APP_ID }}
23+
private_key: ${{ secrets.OBS_AUTOMATION_APP_PEM }}
24+
permissions: >-
25+
{
26+
"members": "read"
27+
}
1828
- name: Add agent-python label
1929
uses: actions-ecosystem/action-add-labels@v1
2030
with:
2131
labels: agent-python
2232
- id: is_elastic_member
23-
uses: elastic/apm-pipeline-library/.github/actions/is-member-elastic-org@current
33+
uses: elastic/oblt-actions/github/is-member-of@v1
2434
with:
25-
username: ${{ github.actor }}
26-
token: ${{ secrets.APM_TECH_USER_TOKEN }}
35+
github-org: "elastic"
36+
github-user: ${{ github.actor }}
37+
github-token: ${{ steps.get_token.outputs.token }}
2738
- name: Add community and triage labels
2839
if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]' && github.actor != 'apmmachine'
2940
uses: actions-ecosystem/action-add-labels@v1

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ jobs:
4747
path: dist
4848
- name: Upload pypi.org
4949
if: startsWith(github.ref, 'refs/tags')
50-
uses: pypa/gh-action-pypi-publish@0ab0b79471669eb3a4d647e625009c62f9f3b241
50+
uses: pypa/gh-action-pypi-publish@f7600683efdcb7656dec5b29656edb7bc586e597 # v1.10.3
5151
with:
5252
repository-url: https://upload.pypi.org/legacy/
5353
- name: Upload test.pypi.org
5454
if: ${{ ! startsWith(github.ref, 'refs/tags') }}
55-
uses: pypa/gh-action-pypi-publish@0ab0b79471669eb3a4d647e625009c62f9f3b241
55+
uses: pypa/gh-action-pypi-publish@f7600683efdcb7656dec5b29656edb7bc586e597 # v1.10.3
5656
with:
5757
repository-url: https://test.pypi.org/legacy/
5858

@@ -119,7 +119,7 @@ jobs:
119119
- uses: actions/checkout@v4
120120

121121
- name: Set up Docker Buildx
122-
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
122+
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
123123

124124
- name: Log in to the Elastic Container registry
125125
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
@@ -146,7 +146,7 @@ jobs:
146146
147147
- name: Build and push image
148148
id: docker-push
149-
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
149+
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
150150
with:
151151
context: .
152152
platforms: linux/amd64,linux/arm64

.github/workflows/test-reporter.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
report:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: elastic/apm-pipeline-library/.github/actions/test-report@current
20+
- uses: elastic/oblt-actions/test-report@v1
2121
with:
22-
artifact: test-results
23-
name: JUnit Tests
22+
artifact: /test-results(.*)/
23+
name: 'Test Report $1'
2424
path: "**/*-python-agent-junit.xml"
2525
reporter: java-junit

Dockerfile.wolfi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:c16d3ad6cebf387e8dd2ad769f54320c4819fbbaa21e729fad087c7ae223b4d0
1+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:bf163e1977002301f7b9fd28fe6837a8cb2dd5c83e4cd45fb67fb28d15d5d40f
22
ARG AGENT_DIR
33
COPY ${AGENT_DIR} /opt/python

0 commit comments

Comments
 (0)