Skip to content

Commit e5db8e5

Browse files
authored
Merge branch 'main' into claude/update-trial-links-explore-JgAAb
2 parents 8c6385f + b8bb463 commit e5db8e5

38 files changed

+9414
-993
lines changed

.github/workflows/docker-build.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,15 @@ jobs:
6363
uses: docker/setup-buildx-action@v3
6464

6565
- name: Azure Login (OIDC)
66+
if: github.event_name != 'pull_request'
6667
uses: azure/login@v2
6768
with:
6869
client-id: ${{ secrets.AZURE_CLIENT_ID }}
6970
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
7071
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
7172

7273
- name: Log in to Azure Container Registry
74+
if: github.event_name != 'pull_request'
7375
run: az acr login --name choacrhy6h2vdulfru6
7476

7577
- name: Extract metadata
@@ -109,13 +111,15 @@ jobs:
109111
uses: docker/setup-buildx-action@v3
110112

111113
- name: Azure Login (OIDC)
114+
if: github.event_name != 'pull_request'
112115
uses: azure/login@v2
113116
with:
114117
client-id: ${{ secrets.AZURE_CLIENT_ID }}
115118
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
116119
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
117120

118121
- name: Log in to Azure Container Registry
122+
if: github.event_name != 'pull_request'
119123
run: az acr login --name choacrhy6h2vdulfru6
120124

121125
- name: Extract metadata
@@ -156,13 +160,15 @@ jobs:
156160
uses: docker/setup-buildx-action@v3
157161

158162
- name: Azure Login (OIDC)
163+
if: github.event_name != 'pull_request'
159164
uses: azure/login@v2
160165
with:
161166
client-id: ${{ secrets.AZURE_CLIENT_ID }}
162167
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
163168
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
164169

165170
- name: Log in to Azure Container Registry
171+
if: github.event_name != 'pull_request'
166172
run: az acr login --name choacrhy6h2vdulfru6
167173

168174
- name: Extract metadata
@@ -337,13 +343,15 @@ jobs:
337343
uses: docker/setup-buildx-action@v3
338344

339345
- name: Azure Login (OIDC)
346+
if: github.event_name != 'pull_request'
340347
uses: azure/login@v2
341348
with:
342349
client-id: ${{ secrets.AZURE_CLIENT_ID }}
343350
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
344351
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
345352

346353
- name: Log in to Azure Container Registry
354+
if: github.event_name != 'pull_request'
347355
run: az acr login --name choacrhy6h2vdulfru6
348356

349357
- name: Extract metadata

.github/workflows/test-dotnet.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
# run: dotnet test --no-build --verbosity normal --logger "trx;LogFileName=member-service-test-results.trx" --collect:"XPlat Code Coverage"
7070

7171
- name: Upload test results
72-
uses: actions/upload-artifact@v6
72+
uses: actions/upload-artifact@v4
7373
if: always()
7474
with:
7575
name: dotnet-test-results
@@ -95,7 +95,7 @@ jobs:
9595
- uses: actions/checkout@v4
9696

9797
- name: Setup Node.js
98-
uses: actions/setup-node@v6
98+
uses: actions/setup-node@v4
9999
with:
100100
node-version: '20'
101101
cache: 'npm'
@@ -124,7 +124,7 @@ jobs:
124124
- uses: actions/checkout@v4
125125

126126
- name: Download test results
127-
uses: actions/download-artifact@v7
127+
uses: actions/download-artifact@v4
128128
with:
129129
name: dotnet-test-results
130130
path: ./TestResults

0 commit comments

Comments
 (0)