Skip to content

Commit fec57fd

Browse files
authored
Use shared action (#95)
1 parent c9ea87a commit fec57fd

File tree

2 files changed

+22
-32
lines changed

2 files changed

+22
-32
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,21 @@ jobs:
3030
with:
3131
fetch-depth: 0
3232

33-
- name: 'Azure CLI login'
34-
uses: azure/login@v2
33+
- name: Get gsoft-nuget-feed secret
34+
id: get_gsoft_nuget_feed_secret
35+
uses: workleap/wl-reusable-workflows/retrieve-managed-secret@main
3536
with:
36-
client-id: ${{ vars.AZURE_CLIENT_ID }}
37-
tenant-id: ${{ vars.AZURE_TENANT_ID }}
38-
subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }}
39-
40-
- name: Get Secrets from Azure Key Vault
41-
id: get_secrets
42-
run: |
43-
# Set env.ADO_PAT
44-
ADO_PAT=$(az keyvault secret show --vault-name ${{ vars.IDP_CICD_KEYVAULT_NAME }} --name "gsoft-nuget-feed-ado-pat" --query value -o tsv)
45-
echo "::add-mask::$ADO_PAT"
46-
echo "ado_pat=$ADO_PAT" >> $GITHUB_OUTPUT
37+
azure-client-id: ${{ vars.AZURE_CLIENT_ID }}
38+
azure-tenant-id: ${{ vars.AZURE_TENANT_ID }}
39+
azure-subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }}
40+
keyvault-name: ${{ vars.IDP_CICD_KEYVAULT_NAME }}
41+
secret-name: "gsoft-nuget-feed-ado-pat"
4742

4843
- uses: actions/setup-dotnet@v4
4944
with:
50-
source-url: ${{ secrets.NUGET_GSOFTDEV_FEED_URL }}
45+
source-url: ${{ vars.GSOFTDEV_NUGET_SOURCE }}
5146
env:
52-
NUGET_AUTH_TOKEN: ${{ steps.get_secrets.outputs.ado_pat }}
47+
NUGET_AUTH_TOKEN: ${{ steps.get_gsoft_nuget_feed_secret.outputs.secret }}
5348

5449
- name: Install Mono
5550
shell: bash
@@ -62,8 +57,8 @@ jobs:
6257
- run: ./Build.ps1
6358
shell: pwsh
6459
env:
65-
NUGET_SOURCE: ${{ secrets.NUGET_GSOFTDEV_FEED_URL }}
66-
NUGET_API_KEY: ${{ steps.get_secrets.outputs.ado_pat }}
60+
NUGET_SOURCE: ${{ vars.GSOFTDEV_NUGET_SOURCE }}
61+
NUGET_API_KEY: ${{ steps.get_gsoft_nuget_feed_secret.outputs.secret }}
6762

6863
linearb:
6964
needs: [main]

.github/workflows/publish.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,15 @@ jobs:
2323
with:
2424
fetch-depth: 0
2525

26-
- name: 'Azure CLI login'
27-
uses: azure/login@v2
26+
- name: Get nuget-org-workleap-api-key
27+
id: get_nuget_org_workleap_api_key_secret
28+
uses: workleap/wl-reusable-workflows/retrieve-managed-secret@main
2829
with:
29-
client-id: ${{ vars.AZURE_CLIENT_ID }}
30-
tenant-id: ${{ vars.AZURE_TENANT_ID }}
31-
subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }}
32-
33-
- name: Get Secrets from Azure Key Vault
34-
id: get_secrets
35-
run: |
36-
# Set env.WORKLEAP_NUGET_API_KEY
37-
WORKLEAP_NUGET_API_KEY=$(az keyvault secret show --vault-name ${{ vars.IDP_CICD_KEYVAULT_NAME }} --name "nuget-org-workleap-api-key" --query value -o tsv)
38-
echo "::add-mask::$WORKLEAP_NUGET_API_KEY"
39-
echo "workleap_nuget_api_key=$WORKLEAP_NUGET_API_KEY" >> $GITHUB_OUTPUT
30+
azure-client-id: ${{ vars.AZURE_CLIENT_ID }}
31+
azure-tenant-id: ${{ vars.AZURE_TENANT_ID }}
32+
azure-subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }}
33+
keyvault-name: ${{ vars.IDP_CICD_KEYVAULT_NAME }}
34+
secret-name: "nuget-org-workleap-api-key"
4035

4136
- uses: actions/setup-dotnet@v4
4237

@@ -51,8 +46,8 @@ jobs:
5146
- run: ./Build.ps1
5247
shell: pwsh
5348
env:
54-
NUGET_SOURCE: ${{ secrets.NUGET_SOURCE }}
55-
NUGET_API_KEY: ${{ steps.get_secrets.outputs.workleap_nuget_api_key }}
49+
NUGET_SOURCE: ${{ vars.NUGET_SOURCE }}
50+
NUGET_API_KEY: ${{ steps.get_nuget_org_workleap_api_key_secret.outputs.secret }}
5651

5752
linearb:
5853
needs: [main]

0 commit comments

Comments
 (0)