Skip to content

Commit f6e005b

Browse files
committed
release/4.1.0 - Build fix
1 parent 9d8a3bb commit f6e005b

File tree

2 files changed

+154
-148
lines changed

2 files changed

+154
-148
lines changed

.github/workflows/release.yml

+147-146
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
name: Create NuGet and GitHub Release
22

33
on:
4-
pull_request:
5-
types:
6-
- closed
4+
pull_request: {}
5+
6+
push:
7+
branches: ["master"]
78
workflow_dispatch:
89

910
permissions:
@@ -19,7 +20,7 @@ jobs:
1920
name: Build
2021
runs-on: windows-latest
2122
environment: 'release'
22-
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged && startsWith(github.event.pull_request.head.ref, 'release/'))
23+
# if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && startsWith(github.event.pull_request.head.ref, 'release/'))
2324
steps:
2425
- name: Checkout code
2526
uses: actions/checkout@v4
@@ -179,146 +180,146 @@ jobs:
179180
PRODSEC_TOOLS_TOKEN: ${{ secrets.PRODSEC_TOOLS_TOKEN }}
180181
PRODSEC_TOOLS_ARN: ${{ secrets.PRODSEC_TOOLS_ARN }}
181182

182-
android:
183-
name: Android
184-
uses: ./.github/workflows/nuget-release.yml
185-
needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
186-
with:
187-
tag-prefix: 'android-'
188-
project-path: "src/Auth0.OidcClient.Android"
189-
nuspec-file: "nuget/Auth0.OidcClient.Android.nuspec"
190-
secrets:
191-
nuget-token: ${{ secrets.NUGET_API_KEY }}
192-
github-token: ${{ secrets.GITHUB_TOKEN }}
193-
194-
androidx:
195-
name: AndroidX
196-
uses: ./.github/workflows/nuget-release.yml
197-
needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
198-
with:
199-
tag-prefix: 'androidx-'
200-
project-path: "src/Auth0.OidcClient.AndroidX"
201-
nuspec-file: "nuget/Auth0.OidcClient.AndroidX.nuspec"
202-
secrets:
203-
nuget-token: ${{ secrets.NUGET_API_KEY }}
204-
github-token: ${{ secrets.GITHUB_TOKEN }}
205-
206-
ios:
207-
name: iOS
208-
uses: ./.github/workflows/nuget-release.yml
209-
needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
210-
with:
211-
tag-prefix: 'ios-'
212-
project-path: "src/Auth0.OidcClient.iOS"
213-
nuspec-file: "nuget/Auth0.OidcClient.iOS.nuspec"
214-
secrets:
215-
nuget-token: ${{ secrets.NUGET_API_KEY }}
216-
github-token: ${{ secrets.GITHUB_TOKEN }}
217-
218-
core:
219-
name: Core
220-
uses: ./.github/workflows/nuget-release.yml
221-
needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
222-
with:
223-
tag-prefix: 'core-'
224-
project-path: "src/Auth0.OidcClient.Core"
225-
nuspec-file: "nuget/Auth0.OidcClient.Core.nuspec"
226-
secrets:
227-
nuget-token: ${{ secrets.NUGET_API_KEY }}
228-
github-token: ${{ secrets.GITHUB_TOKEN }}
229-
230-
wpf:
231-
name: WPF
232-
uses: ./.github/workflows/nuget-release.yml
233-
needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
234-
with:
235-
tag-prefix: 'wpf-'
236-
project-path: "src/Auth0.OidcClient.WPF"
237-
nuspec-file: "nuget/Auth0.OidcClient.WPF.nuspec"
238-
secrets:
239-
nuget-token: ${{ secrets.NUGET_API_KEY }}
240-
github-token: ${{ secrets.GITHUB_TOKEN }}
183+
# android:
184+
# name: Android
185+
# uses: ./.github/workflows/nuget-release.yml
186+
# needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
187+
# with:
188+
# tag-prefix: 'android-'
189+
# project-path: "src/Auth0.OidcClient.Android"
190+
# nuspec-file: "nuget/Auth0.OidcClient.Android.nuspec"
191+
# secrets:
192+
# nuget-token: ${{ secrets.NUGET_API_KEY }}
193+
# github-token: ${{ secrets.GITHUB_TOKEN }}
194+
195+
# androidx:
196+
# name: AndroidX
197+
# uses: ./.github/workflows/nuget-release.yml
198+
# needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
199+
# with:
200+
# tag-prefix: 'androidx-'
201+
# project-path: "src/Auth0.OidcClient.AndroidX"
202+
# nuspec-file: "nuget/Auth0.OidcClient.AndroidX.nuspec"
203+
# secrets:
204+
# nuget-token: ${{ secrets.NUGET_API_KEY }}
205+
# github-token: ${{ secrets.GITHUB_TOKEN }}
206+
207+
# ios:
208+
# name: iOS
209+
# uses: ./.github/workflows/nuget-release.yml
210+
# needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
211+
# with:
212+
# tag-prefix: 'ios-'
213+
# project-path: "src/Auth0.OidcClient.iOS"
214+
# nuspec-file: "nuget/Auth0.OidcClient.iOS.nuspec"
215+
# secrets:
216+
# nuget-token: ${{ secrets.NUGET_API_KEY }}
217+
# github-token: ${{ secrets.GITHUB_TOKEN }}
218+
219+
# core:
220+
# name: Core
221+
# uses: ./.github/workflows/nuget-release.yml
222+
# needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
223+
# with:
224+
# tag-prefix: 'core-'
225+
# project-path: "src/Auth0.OidcClient.Core"
226+
# nuspec-file: "nuget/Auth0.OidcClient.Core.nuspec"
227+
# secrets:
228+
# nuget-token: ${{ secrets.NUGET_API_KEY }}
229+
# github-token: ${{ secrets.GITHUB_TOKEN }}
230+
231+
# wpf:
232+
# name: WPF
233+
# uses: ./.github/workflows/nuget-release.yml
234+
# needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
235+
# with:
236+
# tag-prefix: 'wpf-'
237+
# project-path: "src/Auth0.OidcClient.WPF"
238+
# nuspec-file: "nuget/Auth0.OidcClient.WPF.nuspec"
239+
# secrets:
240+
# nuget-token: ${{ secrets.NUGET_API_KEY }}
241+
# github-token: ${{ secrets.GITHUB_TOKEN }}
241242

242-
winforms:
243-
name: WinForms
244-
uses: ./.github/workflows/nuget-release.yml
245-
needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
246-
with:
247-
tag-prefix: 'winforms-'
248-
project-path: "src/Auth0.OidcClient.WinForms"
249-
nuspec-file: "nuget/Auth0.OidcClient.WinForms.nuspec"
250-
secrets:
251-
nuget-token: ${{ secrets.NUGET_API_KEY }}
252-
github-token: ${{ secrets.GITHUB_TOKEN }}
253-
254-
uwp:
255-
name: UWP
256-
uses: ./.github/workflows/nuget-release.yml
257-
needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
258-
with:
259-
tag-prefix: 'uwp-'
260-
project-path: "src/Auth0.OidcClient.UWP"
261-
nuspec-file: "nuget/Auth0.OidcClient.UWP.nuspec"
262-
secrets:
263-
nuget-token: ${{ secrets.NUGET_API_KEY }}
264-
github-token: ${{ secrets.GITHUB_TOKEN }}
265-
266-
maui:
267-
name: MAUI
268-
uses: ./.github/workflows/nuget-release.yml
269-
needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
270-
with:
271-
tag-prefix: 'maui-'
272-
project-path: "src/Auth0.OidcClient.MAUI"
273-
nuspec-file: "nuget/Auth0.OidcClient.MAUI.nuspec"
274-
secrets:
275-
nuget-token: ${{ secrets.NUGET_API_KEY }}
276-
github-token: ${{ secrets.GITHUB_TOKEN }}
277-
278-
generate-docs:
279-
name: Generate API docs
280-
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged && startsWith(github.event.pull_request.head.ref, 'release/'))
281-
runs-on: windows-latest
282-
environment: release
283-
needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
284-
285-
steps:
286-
- name: Checkout code
287-
uses: actions/checkout@v4
288-
with:
289-
fetch-depth: 0
290-
291-
- uses: actions/download-artifact@v4
292-
with:
293-
path: './src'
294-
name: build
295-
296-
- name: Install DocFX
297-
run: dotnet tool install -g docfx
298-
299-
- name: Build docs
300-
run: ./tools/build-docs.sh
301-
shell: bash
302-
303-
- uses: actions/upload-pages-artifact@v2
304-
with:
305-
path: docs
306-
307-
deploy-docs:
308-
needs: generate-docs
309-
name: Deploy API docs
310-
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged && startsWith(github.event.pull_request.head.ref, 'release/'))
311-
312-
permissions:
313-
pages: write # to deploy to Pages
314-
id-token: write # to verify the deployment originates from an appropriate source
315-
316-
environment:
317-
name: github-pages
318-
url: ${{ steps.deployment.outputs.page_url }}
319-
320-
runs-on: ubuntu-latest
321-
steps:
322-
- name: Deploy to GitHub Pages
323-
id: deployment
324-
uses: actions/deploy-pages@v3 # or specific "vX.X.X" version tag for this action
243+
# winforms:
244+
# name: WinForms
245+
# uses: ./.github/workflows/nuget-release.yml
246+
# needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
247+
# with:
248+
# tag-prefix: 'winforms-'
249+
# project-path: "src/Auth0.OidcClient.WinForms"
250+
# nuspec-file: "nuget/Auth0.OidcClient.WinForms.nuspec"
251+
# secrets:
252+
# nuget-token: ${{ secrets.NUGET_API_KEY }}
253+
# github-token: ${{ secrets.GITHUB_TOKEN }}
254+
255+
# uwp:
256+
# name: UWP
257+
# uses: ./.github/workflows/nuget-release.yml
258+
# needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
259+
# with:
260+
# tag-prefix: 'uwp-'
261+
# project-path: "src/Auth0.OidcClient.UWP"
262+
# nuspec-file: "nuget/Auth0.OidcClient.UWP.nuspec"
263+
# secrets:
264+
# nuget-token: ${{ secrets.NUGET_API_KEY }}
265+
# github-token: ${{ secrets.GITHUB_TOKEN }}
266+
267+
# maui:
268+
# name: MAUI
269+
# uses: ./.github/workflows/nuget-release.yml
270+
# needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
271+
# with:
272+
# tag-prefix: 'maui-'
273+
# project-path: "src/Auth0.OidcClient.MAUI"
274+
# nuspec-file: "nuget/Auth0.OidcClient.MAUI.nuspec"
275+
# secrets:
276+
# nuget-token: ${{ secrets.NUGET_API_KEY }}
277+
# github-token: ${{ secrets.GITHUB_TOKEN }}
278+
279+
# generate-docs:
280+
# name: Generate API docs
281+
# if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged && startsWith(github.event.pull_request.head.ref, 'release/'))
282+
# runs-on: windows-latest
283+
# environment: release
284+
# needs: [rl-scanner-android,rl-scanner-androidx,rl-scanner-iOS,rl-scanner-core,rl-scanner-wpf,rl-scanner-winforms,rl-scanner-uwp,rl-scanner-maui]
285+
286+
# steps:
287+
# - name: Checkout code
288+
# uses: actions/checkout@v4
289+
# with:
290+
# fetch-depth: 0
291+
292+
# - uses: actions/download-artifact@v4
293+
# with:
294+
# path: './src'
295+
# name: build
296+
297+
# - name: Install DocFX
298+
# run: dotnet tool install -g docfx
299+
300+
# - name: Build docs
301+
# run: ./tools/build-docs.sh
302+
# shell: bash
303+
304+
# - uses: actions/upload-pages-artifact@v2
305+
# with:
306+
# path: docs
307+
308+
# deploy-docs:
309+
# needs: generate-docs
310+
# name: Deploy API docs
311+
# if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged && startsWith(github.event.pull_request.head.ref, 'release/'))
312+
313+
# permissions:
314+
# pages: write # to deploy to Pages
315+
# id-token: write # to verify the deployment originates from an appropriate source
316+
317+
# environment:
318+
# name: github-pages
319+
# url: ${{ steps.deployment.outputs.page_url }}
320+
321+
# runs-on: ubuntu-latest
322+
# steps:
323+
# - name: Deploy to GitHub Pages
324+
# id: deployment
325+
# uses: actions/deploy-pages@v3 # or specific "vX.X.X" version tag for this action

.github/workflows/rl-secure.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ on:
3030
jobs:
3131
rl-scanner:
3232
name: Run Reversing Labs scanner
33-
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged && startsWith(github.event.pull_request.head.ref, 'release/'))
33+
# if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && startsWith(github.event.pull_request.head.ref, 'release/'))
3434
runs-on: ubuntu-latest
3535
outputs:
3636
scan-status: ${{ steps.rl-scan-conclusion.outcome }}
@@ -45,7 +45,12 @@ jobs:
4545
uses: actions/setup-dotnet@v3
4646
with:
4747
dotnet-version: '8.0.404'
48-
48+
49+
- name: Install NuGet CLI
50+
run: |
51+
curl -sSL https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -o /usr/local/bin/nuget
52+
chmod +x /usr/local/bin/nuget
53+
4954
- uses: actions/download-artifact@v4
5055
with:
5156
path: './src'

0 commit comments

Comments
 (0)