Skip to content

Commit baab3b7

Browse files
authored
[v0.17.x] *: remove marker in favor of Github action (#3048) (#3054)
1 parent 747f2fe commit baab3b7

File tree

8 files changed

+26
-47
lines changed

8 files changed

+26
-47
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"ignorePatterns": [
3+
{ "pattern": "^https://github.com/\\S+/\\S+/(issues|pull)/[0-9]+" },
4+
{ "pattern": "^mailto:" }
5+
]
6+
}

.github/workflows/markdown.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Check Markdown links
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- master
8+
9+
jobs:
10+
markdown-link-check:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@master
14+
- uses: gaurav-nelson/[email protected]
15+
with:
16+
max-depth: 1
17+
config-file: '.github/workflows/markdown-link-check-config.json'

.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,6 @@ jobs:
109109
script:
110110
- make test-sanity
111111

112-
# Run the markdown link checker
113-
- name: Markdown Tests
114-
script:
115-
- make test-markdown
116-
117112
## Operator test stage jobs ##
118113

119114
# Build and test ansible and test ansible using molecule

Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,10 @@ image-push-scorecard-test:
209209
##@ Tests
210210

211211
# Static tests.
212-
.PHONY: test test-markdown test-sanity test-unit
212+
.PHONY: test test-sanity test-unit
213213

214214
test: test-unit ## Run the tests
215215

216-
test-markdown:
217-
./hack/check-markdown.sh
218-
219216
test-sanity: tidy build/operator-sdk lint
220217
./hack/tests/sanity-check.sh
221218

@@ -225,7 +222,7 @@ test-unit: ## Run the unit tests
225222
# CI tests.
226223
.PHONY: test-ci
227224

228-
test-ci: test-markdown test-sanity test-unit install test-subcommand test-e2e ## Run the CI test suite
225+
test-ci: test-sanity test-unit install test-subcommand test-e2e ## Run the CI test suite
229226

230227
# Subcommand tests.
231228
.PHONY: test-subcommand test-subcommand-local test-subcommand-scorecard test-subcommand-olm-install

hack/check-markdown.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

hack/ci/marker

-1.22 MB
Binary file not shown.

website/content/en/docs/contribution-guidelines/testing/running-the-tests.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ $ export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
5757
All the tests are run through the [`Makefile`][makefile]. This is a brief description of all makefile test instructions:
5858

5959
- `test` - Runs the unit tests (`test-unit`).
60-
- `test-ci` - Runs markdown, sanity, and unit tests, installs the SDK binary, and runs the SDK subcommand and all E2E tests.
60+
- `test-ci` - Runs sanity and unit tests, installs the SDK binary, and runs the SDK subcommand and all E2E tests.
6161
- `test-sanity` - Runs sanity checks.
6262
- `test-unit` - Runs unit tests.
6363
- `test-subcommand` - Runs subcommand tests.
@@ -66,7 +66,6 @@ All the tests are run through the [`Makefile`][makefile]. This is a brief descri
6666
- `test-e2e-ansible` - Runs the ansible E2E test.
6767
- `test-e2e-ansible-molecule` - Runs the ansible molecule E2E test.
6868
- `test-e2e-helm` - Runs the helm E2E test.
69-
- `test-markdown` - Runs the markdown checks
7069

7170
For more info on what these tests actually do, please see the [Travis Build][travis] doc.
7271

website/content/en/docs/contribution-guidelines/testing/travis-build.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ In Travis CI, 4 jobs are run to test the sdk:
1313
- [Go](#go-tests)
1414
- [Ansible](#ansible-tests)
1515
- [Helm](#helm-tests)
16-
- [Markdown](#markdown)
1716

1817
### Before Install for Go, Ansible, and Helm
1918

@@ -104,12 +103,6 @@ The Go, Ansible, and Helm tests then differ in what tests they run.
104103

105104
**NOTE**: All created resources, including the namespace, are deleted using a bash trap when the test finishes
106105

107-
### Markdown
108-
109-
The markdown test does not create a new cluster and runs in a barebones Travis VM configured only for `bash`. This allows documentation PRs to pass quickly, as they don't require code tests. The markdown checker uses a precompiled version of [`marker`][marker-github] stored in [`hack/ci/marker`][marker-local] to check the validity and correctness of the links in all markdown files in the `doc` directory.
110-
111-
**NOTE**: There is currently a bug in marker that causes link with underscores (`_`) to not be checked correctly.
112-
113106
[branches]: https://travis-ci.org/operator-framework/operator-sdk/branches
114107
[pr-builds]: https://travis-ci.org/operator-framework/operator-sdk/pull_requests
115108
[k8s-script]: https://github.com/operator-framework/operator-sdk/blob/master/hack/ci/setup-k8s.sh
@@ -122,6 +115,4 @@ The markdown test does not create a new cluster and runs in a barebones Travis V
122115
[ansible-test]: https://github.com/operator-framework/operator-sdk/tree/master/test/ansible
123116
[helm-e2e]: https://github.com/operator-framework/operator-sdk/blob/master/hack/tests/e2e-helm.sh
124117
[helm-base]: https://github.com/operator-framework/operator-sdk/blob/master/hack/image/helm/scaffold-helm-image.go
125-
[marker-github]: https://github.com/crawford/marker
126-
[marker-local]: https://github.com/operator-framework/operator-sdk/blob/master/hack/ci/marker
127118
[deps_mgmt]: ../../../golang/quickstart#a-note-on-dependency-management

0 commit comments

Comments
 (0)