Skip to content

Commit 3a264be

Browse files
authored
Merge pull request #1316 from json-api-dotnet/test-from-pr
Test from PR 8 (merged pr)
2 parents f662151 + 9c43fae commit 3a264be

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/dotnet.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ jobs:
261261
# run: |
262262
# dotnet nuget add source --username 'json-api-dotnet' --password "$env:GITHUB_TOKEN" --store-password-in-clear-text --name 'github' 'https://nuget.pkg.github.com/json-api-dotnet/index.json'
263263
# dotnet nuget push "$env:GITHUB_WORKSPACE/packages/*.nupkg" --api-key "$env:GITHUB_TOKEN" --source 'github'
264+
264265
- name: Find merged pull request
265266
id: find_merged_pull_request
266267
#if: github.event_name == 'push' && github.ref == 'refs/heads/master'
@@ -281,8 +282,8 @@ jobs:
281282
publish_branch: gh-pages-test
282283
#publish_branch: gh-pages
283284
publish_dir: ./documentation
284-
#commit_message: 'Auto-generated documentation from: ${{ github.event.head_commit.message }}'
285-
full_commit_message: "Auto-generated documentation from ${{ steps.find_merged_pull_request.outputs.number && format('#{0}', steps.find_merged_pull_request.outputs.number) || github.sha }}"
285+
commit_message: 'Auto-generated documentation from...'
286+
#full_commit_message: "Auto-generated documentation from ${{ steps.find_merged_pull_request.outputs.number && format('#{0}', steps.find_merged_pull_request.outputs.number) || github.sha }}"
286287

287288
- name: Publish to NuGet
288289
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')

docs/home/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
3+
<head>
44
<meta charset="utf-8">
55
<meta content="width=device-width, initial-scale=1.0" name="viewport">
66
<title>JsonApiDotNetCore documentation</title>

0 commit comments

Comments
 (0)