File tree 2 files changed +14
-10
lines changed
2 files changed +14
-10
lines changed Original file line number Diff line number Diff line change @@ -161,18 +161,9 @@ jobs:
161
161
uses : avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@v1
162
162
needs : generate-consolidated-artifacts
163
163
if : ${{ github.event_name == 'push' }}
164
+ environment : NuGet
164
165
with :
165
166
name : Deploy Commercial Plus
166
167
secrets :
167
168
feedUrl : ${{ secrets.PRISM_NUGET_FEED }}
168
169
apiKey : ${{ secrets.PRISM_NUGET_TOKEN }}
169
-
170
- deploy-sponsors :
171
- uses : avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@master
172
- needs : generate-consolidated-artifacts
173
- if : ${{ github.event_name == 'push' }}
174
- with :
175
- name : Deploy Sponsor Connect
176
- secrets :
177
- feedUrl : ${{ secrets.SPONSOR_CONNECT_NUGET_FEED }}
178
- apiKey : ${{ secrets.SPONSOR_CONNECT_TOKEN }}
Original file line number Diff line number Diff line change 12
12
apiKey : ${{ secrets.IN_HOUSE_API_KEY }}
13
13
14
14
publish-commercial-plus :
15
+ <<<<<<< HEAD
15
16
uses : avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@v1
16
17
secrets :
17
18
feedUrl : ${{ secrets.PRISM_NUGET_FEED }}
18
19
apiKey : ${{ secrets.PRISM_NUGET_TOKEN }}
20
+ =======
21
+ uses : avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@master
22
+ environment : NuGet
23
+ secrets :
24
+ feedUrl : ${{ secrets.PRISM_NUGET_FEED }}
25
+ apiKey : ${{ secrets.PRISM_NUGET_TOKEN }}
26
+
27
+ publish-nuget :
28
+ uses : avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@master
29
+ secrets :
30
+ apiKey : ${{ secrets.NUGET_API_KEY }}
31
+ >>>>>>> 919a2209 (ci: remove SponsorConnect)
You can’t perform that action at this time.
0 commit comments