Skip to content

Commit 2634595

Browse files
authored
fix 3.x release workflow; release 3.52.1 (#4304)
This updates the 3.x release.yml workflow with changes (mostly to auth) that have been made to the release workflow on main. - **github-actions: use github secrets (#4129)** - **github: use docker github secrets (#4047)** - **ci(github-secrets): slack and aws lambda publish (#4081)** - **bump some versions to match those used in 'release.yml' on main** - **Use keyless authentication in release (#4109)** - **bump action to same version used on main branch** - **bump to 3.52.1 to try release workflow again** It also drops the labeler.yml workflow from the 3.x branch. It is failing (auth changes) and isn't needed on the 3.x branch.
1 parent c5d43a1 commit 2634595

File tree

5 files changed

+21
-90
lines changed

5 files changed

+21
-90
lines changed

.github/workflows/labeler.yml

-48
This file was deleted.

.github/workflows/release.yml

+15-36
Original file line numberDiff line numberDiff line change
@@ -13,38 +13,30 @@ jobs:
1313
release:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
with:
1818
fetch-depth: 0
1919

20-
- uses: actions/setup-node@v3
20+
- uses: actions/setup-node@v4
2121
with:
22-
node-version: 'v16.15.1'
22+
node-version: 'v16.20.2'
2323

24-
- uses: elastic/apm-pipeline-library/.github/actions/docker-login@current
24+
- name: Log in to the Elastic Container registry
25+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
2526
with:
26-
registry: docker.elastic.co
27-
secret: secret/observability-team/ci/docker-registry/prod
28-
url: ${{ secrets.VAULT_ADDR }}
29-
roleId: ${{ secrets.VAULT_ROLE_ID }}
30-
secretId: ${{ secrets.VAULT_SECRET_ID }}
27+
registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }}
28+
username: ${{ secrets.ELASTIC_DOCKER_USERNAME }}
29+
password: ${{ secrets.ELASTIC_DOCKER_PASSWORD }}
3130

3231
- run: make -C .ci env
3332

3433
- run: make -C .ci dist
3534

3635
- run: make -C .ci push-docker
3736

38-
- name: Read AWS vault secrets
39-
uses: hashicorp/[email protected]
37+
- uses: elastic/oblt-actions/aws/[email protected]
4038
with:
41-
url: ${{ secrets.VAULT_ADDR }}
42-
method: approle
43-
roleId: ${{ secrets.VAULT_ROLE_ID }}
44-
secretId: ${{ secrets.VAULT_SECRET_ID }}
45-
secrets: |
46-
secret/observability-team/ci/service-account/apm-aws-lambda access_key_id | AWS_ACCESS_KEY_ID ;
47-
secret/observability-team/ci/service-account/apm-aws-lambda secret_access_key | AWS_SECRET_ACCESS_KEY
39+
aws-account-id: "267093732750"
4840

4941
- name: Publish AWS lambda
5042
run: make -C .ci publish-in-all-aws-regions create-arn-file
@@ -55,27 +47,14 @@ jobs:
5547
env:
5648
GH_TOKEN: ${{ github.token }}
5749

58-
- name: Read NPM vault secrets
59-
uses: hashicorp/[email protected]
60-
with:
61-
url: ${{ secrets.VAULT_ADDR }}
62-
method: approle
63-
roleId: ${{ secrets.VAULT_ROLE_ID }}
64-
secretId: ${{ secrets.VAULT_SECRET_ID }}
65-
secrets: |
66-
secret/jenkins-ci/npmjs/elasticmachine token | NPMJS_TOKEN ;
67-
totp/code/npmjs-elasticmachine code | TOTP_CODE
68-
6950
- name: npm publish
7051
run: |-
71-
echo "//registry.npmjs.org/:_authToken=${{ env.NPMJS_TOKEN }}" > .npmrc
72-
npm publish --tag="latest-3" --otp=${{ env.TOTP_CODE }}
52+
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
53+
npm publish --provenance
7354
7455
- if: always()
75-
uses: elastic/apm-pipeline-library/.github/actions/notify-build-status@current
56+
uses: elastic/oblt-actions/slack/notify-result@v1
7657
with:
77-
vaultUrl: ${{ secrets.VAULT_ADDR }}
78-
vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
79-
vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
80-
slackChannel: "#apm-agent-node"
58+
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
59+
channel-id: "#apm-agent-node"
8160
message: '[${{ github.repository }}] Release *${{ github.ref_name }}*'

CHANGELOG.asciidoc

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ for the latest (4.x) releases. The 3.x branch will be maintained until
3737
2024-03-07 (6 months after the 4.0.0 release).
3838
3939
40-
[[release-notes-3.52.0]]
41-
==== 3.52.0 - 2024/11/04
40+
[[release-notes-3.52.1]]
41+
==== 3.52.1 - 2024/11/05
4242
4343
[float]
4444
===== Chores
4545
4646
* Improve trace-level logging to better support debugging central config
47-
and transaction sampling issues.
47+
and transaction sampling issues. ({issues}4291[#4291])
4848
4949
5050
[[release-notes-3.51.0]]

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "elastic-apm-node",
3-
"version": "3.52.0",
3+
"version": "3.52.1",
44
"description": "The official Elastic APM agent for Node.js",
55
"main": "index.js",
66
"types": "index.d.ts",

0 commit comments

Comments
 (0)