Skip to content

Commit 8e44c07

Browse files
Move secrets declaration inside reusable wf
1 parent c9e240d commit 8e44c07

File tree

3 files changed

+20
-23
lines changed

3 files changed

+20
-23
lines changed

.github/workflows/e2e-build-test.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
description: Version suffix to apply before building
88
required: false
99
type: string
10-
default: ""
10+
default: "e2e"
1111
build-command:
1212
description: npm script to execute (publish/package)
1313
required: true
@@ -59,15 +59,34 @@ jobs:
5959
env:
6060
BUILD_COMMAND: ${{ inputs.build-command }}
6161
steps:
62+
- id: get-secrets
63+
uses: grafana/shared-workflows/actions/get-vault-secrets@5d7e361bc7e0a183cde8afe9899fb7b596d2659b # v1.2.0
64+
with:
65+
repo_secrets: |
66+
APPLE_CERTIFICATE_P12=apple-certificates:APPLE_CERTIFICATE_P12
67+
CERTIFICATE_PASSWORD=apple-certificates:APPLE_CERTIFICATE_P12_PASSWORD
68+
APPLE_API_KEY_ID=apple-certificates:APPLE_API_KEY_ID
69+
APPLE_API_ISSUER=apple-certificates:APPLE_API_ISSUER
70+
APPLE_API_KEY=apple-certificates:APPLE_API_KEY
71+
SENTRY_DSN=sentry:SENTRY_DSN
72+
SENTRY_AUTH_TOKEN=sentry:SENTRY_AUTH_TOKEN
73+
6274
- uses: actions/checkout@v4
6375
with:
6476
persist-credentials: false
6577

78+
- name: Set version for test release
79+
env:
80+
PACKAGE_VERSION: ${{ inputs.version }}
81+
run: python update_version.py
82+
6683
- name: Setup Node.js
6784
uses: actions/setup-node@v4
6885
with:
6986
node-version: 22
7087

88+
# try earlier python version for appdmg
89+
# https://github.com/electron/forge/issues/3371#issuecomment-2105195302
7190
- name: Install Python 3.11.4
7291
uses: actions/setup-python@v4
7392
with:

.github/workflows/release-please-e2e-tests.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,3 @@ jobs:
1616
uses: ./.github/workflows/e2e-build-test.yml
1717
with:
1818
build-command: package
19-
secrets:
20-
APPLE_CERTIFICATE_P12: ${{ secrets.APPLE_CERTIFICATE_P12 }}
21-
CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
22-
APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
23-
APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
24-
APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
25-
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
26-
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
27-
TRUSTED_SIGNING_ACCOUNT: grafana-premium-eastus
28-
TRUSTED_SIGNING_ENDPOINT: https://eus.codesigning.azure.net/
29-
TRUSTED_SIGNING_PROFILE: grafana-production

.github/workflows/release-test-version.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,3 @@ jobs:
2020
with:
2121
version: ${{ inputs.version }}
2222
build-command: publish
23-
secrets:
24-
APPLE_CERTIFICATE_P12: ${{ secrets.APPLE_CERTIFICATE_P12 }}
25-
CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
26-
APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
27-
APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
28-
APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
29-
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
30-
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
31-
TRUSTED_SIGNING_ACCOUNT: grafana-premium-eastus
32-
TRUSTED_SIGNING_ENDPOINT: https://eus.codesigning.azure.net/
33-
TRUSTED_SIGNING_PROFILE: grafana-production

0 commit comments

Comments
 (0)