Skip to content

Commit 5744cc8

Browse files
Merge branch 'main' of https://github.com/MonoGame/docs.monogame.github.io into consoles
2 parents a669a2f + 1b512bc commit 5744cc8

File tree

2 files changed

+83
-38
lines changed

2 files changed

+83
-38
lines changed

.github/workflows/main.yml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: Build Documentation
1+
name: Build and Deploy Documentation
22
on:
3-
push:
4-
branches:
5-
- 'main'
3+
push:
4+
branches:
5+
- 'main'
66

7-
workflow_dispatch:
7+
workflow_dispatch:
88

99
permissions:
1010
contents: read
@@ -18,36 +18,36 @@ concurrency:
1818
cancel-in-progress: false
1919

2020
jobs:
21-
build:
22-
environment:
23-
name: github-pages
24-
url: ${{ steps.deployment.outputs.page_url }}
25-
runs-on: ubuntu-latest
26-
steps:
27-
- name: Clone Repository
28-
uses: actions/checkout@v4
29-
with:
30-
submodules: recursive
31-
32-
- name: Setup .NET SDK
33-
uses: actions/setup-dotnet@v4
34-
with:
35-
dotnet-version: '8.0.x'
36-
37-
- name: Restore dotnet tools
38-
run: dotnet tool restore
39-
40-
- name: Run Build
41-
run: dotnet docfx docfx.json
42-
43-
- name: Setup Pages
44-
uses: actions/configure-pages@v5
45-
46-
- name: Upload artifact
47-
uses: actions/upload-pages-artifact@v3
48-
with:
49-
path: '_site'
50-
51-
- name: Deploy to GitHub Pages
52-
id: deployment
53-
uses: actions/deploy-pages@v4
21+
build:
22+
environment:
23+
name: github-pages
24+
url: ${{ steps.deployment.outputs.page_url }}
25+
runs-on: ubuntu-latest
26+
steps:
27+
- name: Clone Repository
28+
uses: actions/checkout@v4
29+
with:
30+
submodules: recursive
31+
32+
- name: Setup .NET SDK
33+
uses: actions/setup-dotnet@v4
34+
with:
35+
dotnet-version: '8.0.x'
36+
37+
- name: Restore dotnet tools
38+
run: dotnet tool restore
39+
40+
- name: Run Build
41+
run: dotnet docfx docfx.json
42+
43+
- name: Setup Pages
44+
uses: actions/configure-pages@v5
45+
46+
- name: Upload artifact
47+
uses: actions/upload-pages-artifact@v3
48+
with:
49+
path: '_site'
50+
51+
- name: Deploy to GitHub Pages
52+
id: deployment
53+
uses: actions/deploy-pages@v4

.github/workflows/pullrequest.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Test Build Documentation
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- 'main'
7+
8+
workflow_dispatch:
9+
10+
permissions:
11+
contents: read
12+
pages: write
13+
id-token: write
14+
15+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
16+
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
17+
concurrency:
18+
group: "pages"
19+
cancel-in-progress: false
20+
21+
jobs:
22+
test:
23+
runs-on: ubuntu-latest
24+
concurrency: ci-${{ github.ref }}
25+
steps:
26+
- name: Clone Repository
27+
uses: actions/checkout@v4
28+
29+
- name: Setup .NET SDK
30+
uses: actions/setup-dotnet@v4
31+
with:
32+
dotnet-version: '8.0.x'
33+
34+
- name: Restore NPM Packages
35+
run: npm install
36+
37+
- name: Build Site
38+
run: npm run build
39+
40+
complete:
41+
runs-on: ubuntu-latest
42+
needs: test
43+
name: Test completion task
44+
steps:
45+
- run: echo "Tests Complete"

0 commit comments

Comments
 (0)