Skip to content

Commit 9ae81f0

Browse files
nils-anils-a
committed
Merge branch 'release/1.0.6' into main
2 parents 3325e80 + 4acef78 commit 9ae81f0

21 files changed

+294
-413
lines changed

‎.all-contributorsrc‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,23 @@
1414
"code",
1515
"doc"
1616
]
17+
},
18+
{
19+
"login": "pascalberger",
20+
"name": "Pascal Berger",
21+
"avatar_url": "https://avatars1.githubusercontent.com/u/2190718?v=4",
22+
"profile": "https://twitter.com/hereispascal",
23+
"contributions": [
24+
"bug",
25+
"code"
26+
]
1727
}
1828
],
1929
"contributorsPerLine": 7,
20-
"projectName": "Cake.AsciiDoctorJ",
30+
"projectName": "cake.asciidoctorj",
2131
"projectOwner": "cake-contrib",
2232
"repoType": "github",
2333
"repoHost": "https://github.com",
24-
"commitConvention": "none"
34+
"commitConvention": "none",
35+
"skipCi": true
2536
}

‎.appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ test: off
1717
build: off
1818

1919
build_script:
20-
- ps: .\build.ps1 -Target AppVeyor
20+
- ps: .\build.ps1 --target=CI --verbosity=Diagnostic
2121

2222
cache:
23-
- "tools -> recipe.cake,tools/packages.config"
23+
- "tools -> recipe.cake"

‎.config/dotnet-tools.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"cake.tool": {
6+
"version": "0.38.4",
7+
"commands": [
8+
"dotnet-cake"
9+
]
10+
}
11+
}
12+
}

‎.github/dependabot.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "nuget"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
commit-message:
8+
prefix: "(maint)"
9+
target-branch: "develop"
10+
ignore:
11+
- dependency-name: "Cake.Core"
12+
- package-ecosystem: "github-actions"
13+
directory: "/"
14+
schedule:
15+
interval: "daily"
16+
commit-message:
17+
prefix: "(maint)"
18+
target-branch: "develop"

‎.github/workflows/build.yml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Build
2+
3+
on:
4+
push:
5+
paths-ignore:
6+
- "README.md"
7+
pull_request:
8+
9+
env:
10+
# workaround for https://github.com/cake-contrib/Cake.Recipe/issues/724
11+
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
12+
13+
jobs:
14+
build:
15+
runs-on: ${{ matrix.os }}
16+
#mimic "skip_branch_with_pr: true", see https://github.community/t/duplicate-checks-on-push-and-pull-request-simultaneous-event/18012/4
17+
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
18+
strategy:
19+
matrix:
20+
os: [windows-latest, ubuntu-latest, macos-latest]
21+
22+
steps:
23+
- uses: actions/checkout@v2.3.4
24+
with:
25+
fetch-depth: 0
26+
ref: ${{ github.event.ref }}
27+
- name: Cache Tools
28+
uses: actions/cache@v2
29+
with:
30+
path: tools
31+
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
32+
- name: Build project
33+
uses: cake-build/cake-action@v1
34+
with:
35+
script-path: recipe.cake
36+
target: CI
37+
verbosity: Diagnostic
38+
cake-version: 0.38.4
39+
cake-bootstrap: true
40+
- name: Upload Issues
41+
uses: actions/upload-artifact@v2
42+
with:
43+
if-no-files-found: warn
44+
name: ${{ matrix.os }} Issues
45+
path: |
46+
BuildArtifacts/report.html
47+
BuildArtifacts/**/coverlet/*.xml
48+
- name: Upload Packages
49+
uses: actions/upload-artifact@v2
50+
if: matrix.os == 'windows-latest'
51+
with:
52+
if-no-files-found: warn
53+
name: package
54+
path: BuildArtifacts/Packages/**/*

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
name: "CodeQL"
7+
8+
on:
9+
push:
10+
branches: [develop]
11+
pull_request:
12+
# The branches below must be a subset of the branches above
13+
branches: [develop]
14+
schedule:
15+
- cron: '0 15 * * 6'
16+
17+
env:
18+
# workaround for https://github.com/cake-contrib/Cake.Recipe/issues/724
19+
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
20+
21+
jobs:
22+
analyze:
23+
name: Analyze
24+
runs-on: ubuntu-latest
25+
26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
# Override automatic language detection by changing the below list
30+
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
31+
language: ['csharp']
32+
# Learn more...
33+
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
34+
35+
steps:
36+
- name: Checkout repository
37+
uses: actions/checkout@v2.3.4
38+
with:
39+
fetch-depth: 0
40+
41+
# If this run was triggered by a pull request event, then checkout
42+
# the head of the pull request instead of the merge commit.
43+
- run: git checkout HEAD^2
44+
if: ${{ github.event_name == 'pull_request' }}
45+
46+
# Initializes the CodeQL tools for scanning.
47+
- name: Initialize CodeQL
48+
uses: github/codeql-action/init@v1
49+
with:
50+
languages: ${{ matrix.language }}
51+
# If you wish to specify custom queries, you can do so here or in a config file.
52+
# By default, queries listed here will override any specified in a config file.
53+
# Prefix the list here with "+" to use these queries and those in the config file.
54+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
55+
56+
- run: ./build.ps1
57+
shell: pwsh
58+
59+
- name: Perform CodeQL Analysis
60+
uses: github/codeql-action/analyze@v1

‎.github/workflows/dependabot-cake.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Run dependabot for cake
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
# run everyday at 6
6+
- cron: '0 6 * * *'
7+
8+
jobs:
9+
dependabot-cake:
10+
runs-on: ubuntu-latest # linux, because this is a docker-action
11+
steps:
12+
- name: check/update cake dependencies
13+
uses: nils-org/dependabot-cake-action@v1

‎.github/workflows/publishDocs.yml‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,36 @@
11
name: Publish Documentation
22

33
on:
4-
push:
5-
branches: [ develop ]
64
workflow_dispatch:
75

86
env:
97
WYAM_ACCESS_TOKEN: ${{ secrets.API_TOKEN }}
108
# secrets.GITHUB_TOKEN has no permissions to push, sadly.
119
WYAM_DEPLOY_BRANCH: 'gh-pages'
12-
#WYAM_DEPLOY_REMOTE: does not exist in any context, will be dynamically set - see below
10+
WYAM_DEPLOY_REMOTE: "${{ github.event.repository.html_url }}"
1311

1412
jobs:
1513
cake:
16-
runs-on: windows-latest
14+
runs-on: ubuntu-latest
1715

1816
steps:
1917
- name: checkout
20-
uses: actions/checkout@v2 #https://github.com/actions/checkout
18+
uses: actions/checkout@v2.3.4 #https://github.com/actions/checkout
2119
with:
2220
fetch-depth: 0 # GitVersion is somewhat irritated when fetch-depth is "1"....
21+
ref: ${{ github.event.ref }}
2322

24-
- name: call cake
25-
run: |
26-
$env:WYAM_DEPLOY_REMOTE = $( git remote get-url --push origin )
27-
.\build.ps1 -Target PublishDocs -Verbosity Diagnostic
23+
- name: Cache Tools
24+
uses: actions/cache@v2.1.1
25+
with:
26+
path: tools
27+
key: ${{ runner.os }}-doc-tools-${{ hashFiles('recipe.cake') }}
28+
29+
- name: Publishing documentaiton
30+
uses: cake-build/cake-action@v1
31+
with:
32+
script-path: recipe.cake
33+
target: Force-Publish-Documentation
34+
verbosity: Diagnostic
35+
cake-version: 0.38.4
36+
cake-bootstrap: true

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
# Ignore cake tools directory, except packages.config
2121
tools/*
22-
!tools/packages.config
2322

2423
# Ignore build artifacts
2524
BuildArtifacts/

‎GitVersion.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
branches:
2+
master:
3+
regex: ^main$

0 commit comments

Comments
 (0)