Skip to content

Commit c652b48

Browse files
dansiegelmergify[bot]
authored andcommitted
ci: remove SponsorConnect
(cherry picked from commit 919a220) # Conflicts: # .github/workflows/publish-release.yml
1 parent 34befea commit c652b48

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

Diff for: .github/workflows/ci.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -161,18 +161,9 @@ jobs:
161161
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@v1
162162
needs: generate-consolidated-artifacts
163163
if: ${{ github.event_name == 'push' }}
164+
environment: NuGet
164165
with:
165166
name: Deploy Commercial Plus
166167
secrets:
167168
feedUrl: ${{ secrets.PRISM_NUGET_FEED }}
168169
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 }}

Diff for: .github/workflows/publish-release.yml

+13
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,20 @@ jobs:
1212
apiKey: ${{ secrets.IN_HOUSE_API_KEY }}
1313

1414
publish-commercial-plus:
15+
<<<<<<< HEAD
1516
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@v1
1617
secrets:
1718
feedUrl: ${{ secrets.PRISM_NUGET_FEED }}
1819
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)

0 commit comments

Comments
 (0)