Skip to content

Commit a7ef087

Browse files
Confectriciancoop-gitJ-N-Ksancho-sumylampy2
authored
Resolve merge conflicts / Fix CI builds (#1472)
* Apply bulk automated corrections. 🔧(#1433) Signed-off-by: Jerome Luckenbach <[email protected]> * Added sidebar links. (#1434) * Added sidebar links. * Introduce openhabian placeholder page. * Remove local version of openhabian doc page. Signed-off-by: Jerome Luckenbach <[email protected]> * Fix linter errors 🔧(#1435) * Fix errros for the addon folder. * Fix errros for the administration folder. * Fix errros for the concepts folder. * Fix errros for the configuration folder. * Improved and synced markdown linting rules. Signed-off-by: Jerome Luckenbach <[email protected]> * Revert #1428 (#1436) Signed-off-by: Jerome Luckenbach <[email protected]> * Fix linter errors. 🔧(#1437) Signed-off-by: Jerome Luckenbach <[email protected]> * Bulk edit linter errors. (#1438) * Bulk edit linter errors. Signed-off-by: Jerome Luckenbach <[email protected]> * Fix linter style Signed-off-by: Jerome Luckenbach <[email protected]> * Fix linter errors (#1439) * Some leftover linting error fixes. * Adapt rules and enble markdownlint for pull requests. Signed-off-by: Jerome Luckenbach <[email protected]> * Fix markdownlint workflow Signed-off-by: Jerome Luckenbach <[email protected]> * Fixes for linter errors and markdown configuration. (#1440) Signed-off-by: Jerome Luckenbach <[email protected]> * Update guidelines.md (#1441) Only a maintainer told me how to tackle a DTO properly as a class. As I did not see this anywhere, I decide to make this change. * Add fixes from markdownlint-cli (#1442) Signed-off-by: Jerome Luckenbach <[email protected]> * Switch to markdown cli action (#1443) * Fix left markdownlint errors. Signed-off-by: Jerome Luckenbach <[email protected]> * Change to markdownlint-cli action. Signed-off-by: Jerome Luckenbach <[email protected]> * Update markdownlint.yml Signed-off-by: Jerome Luckenbach <[email protected]> * Move trigger order Signed-off-by: Jerome Luckenbach <[email protected]> * Make pr check available for markdownlint 📝 (#1446) * Make pr check available for markdownlint (hopefully). Signed-off-by: Jerome Luckenbach <[email protected]> * Add link check action. (#1449) * Add link check action. Signed-off-by: Jerome Luckenbach <[email protected]> * Add blank line. Signed-off-by: Jerome Luckenbach <[email protected]> * Replace local urls with inline code. Change one occurence to openhabian. (#1450) Signed-off-by: Jerome Luckenbach <[email protected]> * remove uncessary instructions f. contribution guide (#1454) * Update items.md (#1455) Example with item Switch Kitchen_Light in the example is not correct for current binding version. * Created API token docs (#1453) * Created API token docs Signed-off-by: Gerwin Lammers <[email protected]> * Update after review session Signed-off-by: Gerwin Lammers <[email protected]> * Add new page to sidebar navigation. Signed-off-by: Jerome Luckenbach <[email protected]> Co-authored-by: Jerome Luckenbach <[email protected]> * Update rules-dsl.md (#1456) * Update rules-dsl.md Corrected the "system started" section to reflect that the trigger will no longer execute on loading the rules file in OH v.3. * Adapt inline codeblock design. Signed-off-by: Jerome Luckenbach <[email protected]> Co-authored-by: Jerome Luckenbach <[email protected]> * Remove paper ui references. (#1457) * Remove paper uii references. Signed-off-by: Jerome Luckenbach <[email protected]> * Fix Markdown errors. Signed-off-by: Jerome Luckenbach <[email protected]> * Remove target param from markdownlint pr trigger. Signed-off-by: Jerome Luckenbach <[email protected]> * Update items.md (#1458) There is one comma too much in the sample for profile hysteresis. The profile must be related to the channel. The comma will lead also to an error message in log. Switch Low_Battery { channel="serialbutton:button:mybutton:battery-level" [profile="hysteresis", lower=15, inverted=true] } * Remove cronmaker since it doesn't support HTTPS (#1459) 1. When trying to reach https://www.cronmaker.com/ the website refuses the connection. You can only reach it using HTTP (without HTTPS). You could leave cronmaker in there but I think leading users to web pages that aren't using HTTPS might be not be best idea. 2. Fix Typo in url for quartz-scheduler.org * Update links to target "main" branches (#1460) * Update links to target "main" branches Signed-off-by: Wouter Born <[email protected]> * Update process_file.rb Signed-off-by: Wouter Born <[email protected]> * Update for all other repos too Signed-off-by: Wouter Born <[email protected]> * Add hint that /etc/default/openhab2 is not considered by the upgrade (#1461) * Add hint that /etc/default/openhab2 is not considered by the upgrade When you use a raspberry you may have used the file /etc/default/openhab2 to changed JAVA options. After upgrade to openHAB 3.0 this file is no longer used. Instead the file /etc/default/openhab must be used. * Small modifications to original pull request. Signed-off-by: Jerome Luckenbach <[email protected]> Co-authored-by: Jerome Luckenbach <[email protected]> * Fix typo in restdocs (#1463) * Update rules-dsl.md (#1465) Updated the rule example "Start wake up light on sunrise" to use the new formatting of the receivedEvent implicit variable * Update list of system default channel types (#1467) Related to openhab/openhab-core#2069 Related to openhab/openhab-core#2157 Signed-off-by: Christoph Weitkamp <[email protected]> * Delete habpanel.md (#1471) * Delete habpanel.md This file is gathered from its code repository for a long time already. Signed-off-by: Jerome Luckenbach <[email protected]> * Add habpanel placeholder for preview Signed-off-by: Jerome Luckenbach <[email protected]> Co-authored-by: coop-git <[email protected]> Co-authored-by: J-N-K <[email protected]> Co-authored-by: sancho-sumy <[email protected]> Co-authored-by: Gerwin Lammers <[email protected]> Co-authored-by: dathbe <[email protected]> Co-authored-by: thefechner <[email protected]> Co-authored-by: Felix Schneider <[email protected]> Co-authored-by: Wouter Born <[email protected]> Co-authored-by: BertramVielsack <[email protected]> Co-authored-by: mueller-ma <[email protected]> Co-authored-by: lukiep111 <[email protected]> Co-authored-by: Christoph Weitkamp <[email protected]>
1 parent 2002490 commit a7ef087

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+1075
-1998
lines changed

.github/markdownStyle.rb

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

.github/workflows/brokenLinkCheck.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Check for broken links
2+
3+
# https://github.blog/2020-08-03-github-actions-improvements-for-fork-and-pull-request-workflows/
4+
5+
on:
6+
push:
7+
branches:
8+
- main
9+
10+
jobs:
11+
12+
markdown-link-check:
13+
14+
name: Check for broken links
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@master
18+
- uses: gaurav-nelson/github-action-markdown-link-check@v1

.github/workflows/markdownlint.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
name: Linting
1+
name: Checking Markdown For Errors
2+
3+
# https://github.blog/2020-08-03-github-actions-improvements-for-fork-and-pull-request-workflows/
24

35
on:
46
push:
57
branches:
6-
- 'main'
7-
- '2.5.x'
8+
- main
9+
- 2.5.x
810
tags-ignore:
911
- '**'
10-
# pull_request:
11-
# branches:
12-
# - main
13-
# types: [open,synchronize,reopen]
12+
13+
pull_request:
14+
branches:
15+
- main
16+
types:
17+
- open
18+
- synchronize
19+
- reopen
1420

1521
jobs:
1622
markdownlint:
@@ -20,7 +26,8 @@ jobs:
2026
- name: Check out code
2127
uses: actions/checkout@v2
2228

23-
- name: Run markdownlint (mdl)
24-
uses: bewuethr/mdl-action@v1.0.12
29+
- name: Run markdownlint-cli
30+
uses: Confectrician/github-action-markdown-cli@v2.0.0
2531
with:
26-
style-file: .github/markdownStyle.rb
32+
files: .
33+
config_file: ".markdownlint.yaml"

.markdownlint.json

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

.markdownlint.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
default: true
2+
3+
# Expect dash usage for unorderd lists
4+
MD004:
5+
style: dash
6+
7+
# Allow long line lengths
8+
MD013: false
9+
10+
# Allow duplicate headers for different nesting
11+
MD024:
12+
allow_different_nesting: true
13+
14+
# Allow Multiple top level headers in the same document
15+
MD025: false
16+
17+
# Allow trailing punctuation in headers
18+
MD026: false
19+
MD029:
20+
style: one
21+
22+
# Allow inline HTML
23+
MD033: false
24+
25+
# Code block style
26+
MD046:
27+
style: fenced

.vuepress/add_placeholders.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@
33
def add_placeholder_pages()
44
puts ">>> Adding placeholder pages for preview"
55
[
6+
"addons/integrations/homekit",
7+
"docs/apps/android.md",
68
"docs/configuration/iconsets/classic",
79
"docs/configuration/ui/habmin",
810
"docs/configuration/ui/habot",
11+
"docs/configuration/ui/habpanel",
912
"docs/configuration/ui/basic",
1013
"docs/configuration/ui/classic",
1114
"docs/ecosystem/alexa",
1215
"docs/ecosystem/google-assistant",
1316
"docs/ecosystem/ifttt",
1417
"docs/ecosystem/mycroft",
15-
"addons/integrations/homekit",
18+
"docs/installation/openhabian.md",
1619
"link/homekit",
17-
"link/openhabcloud",
18-
"docs/apps/android.md"
20+
"link/openhabcloud"
1921
].each { |path|
2022
puts " -> #{path}"
2123
page = path

.vuepress/docs-sidebar.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,16 @@ module.exports = [
8484
'configuration/habpanel',
8585
['configuration/ui/basic/', 'Basic UI'],
8686
['configuration/restdocs', 'REST API'],
87+
['configuration/apitokens', 'API Token Generation'],
8788
['apps/android', 'Android App'],
8889
'apps/ios',
8990
'apps/windows',
9091
['ecosystem/alexa/', 'Amazon Alexa'],
9192
['ecosystem/google-assistant/', 'Google Assistant'], // from v2.3 onwards
92-
['../addons/integrations/homekit/', 'Apple HomeKit'],
93+
['../link/homekit/', 'Apple HomeKit'],
9394
// ['ecosystem/ifttt/', 'IFTTT'], // Temporary remove until service gets reactivated
9495
['ecosystem/mycroft/', 'Mycroft.AI'],
96+
['../link/openhabcloud/', 'openHAB Cloud'],
9597
]
9698
},
9799
{

.vuepress/process_file.rb

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,18 @@ def process_file(indir, file, outdir, source)
5757
addon_type = outdir_parts[1]
5858
addon = file.split('/')[0]
5959
source = ""
60-
if addon == "habmin" then
61-
puts " (add-on is habmin)"
62-
source = "https://github.com/openhab/org.openhab.ui.habmin/blob/master/README.md"
63-
elsif addon == "habpanel" then
60+
if addon == "habpanel" then
6461
puts " (add-on is habpanel)"
65-
source = "https://github.com/openhab/org.openhab.ui.habpanel/blob/master/README.md"
62+
source = "https://github.com/openhab/openhab-webui/blob/main/bundles/org.openhab.ui.habpanel/README.md"
6663
elsif addon == "zigbee" then
6764
puts " (add-on is zigbee)"
68-
source = "https://github.com/openhab/org.openhab.binding.zigbee/blob/master/org.openhab.binding.zigbee/README.md"
65+
source = "https://github.com/openhab/org.openhab.binding.zigbee/blob/main/org.openhab.binding.zigbee/README.md"
6966
elsif addon == "zwave" && !(file =~ /things/) then
7067
puts " (add-on is zwave)"
71-
source = "https://github.com/openhab/org.openhab.binding.zwave/blob/master/README.md"
72-
elsif $esh_features.include?("esh-#{addon_type}-#{addon.gsub('.', '-')}") then
73-
puts " (add-on is from ESH)"
74-
source = "https://github.com/eclipse/smarthome/blob/master/extensions/#{addon_type}/org.eclipse.smarthome.#{addon_type}.#{addon}/README.md"
68+
source = "https://github.com/openhab/org.openhab.binding.zwave/blob/main/README.md"
7569
elsif !(file =~ /things/) then
7670
puts " (add-on is from openhab-addons)"
77-
source = "https://github.com/openhab/openhab-addons/blob/master/addons/#{addon_type}/org.openhab.#{addon_type}.#{addon}/README.md"
71+
source = "https://github.com/openhab/openhab-addons/blob/main/addons/#{addon_type}/org.openhab.#{addon_type}.#{addon}/README.md"
7872
end
7973

8074
out.puts "source: #{source}" if source != ""

.vuepress/process_main_docs.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
def process_main_docs(docs_source_dir)
44

55
puts ">>> Migrating the introduction article"
6-
process_file(".", "introduction.md", "docs", "https://github.com/openhab/openhab-docs/blob/master/introduction.md")
6+
process_file(".", "introduction.md", "docs", "https://github.com/openhab/openhab-docs/blob/main/introduction.md")
77
FileUtils.mv("docs/introduction.md", "docs/readme.md")
88

99

CONTRIBUTING.md

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Contribution Guidelines
22

3-
### Pull requests are always welcome
3+
## Pull requests are always welcome
44

55
We are always thrilled to receive pull requests, and do our best to
66
process them as fast as possible. Not sure if that typo is worth a pull
77
request? Do it! We will appreciate it.
88

9-
### Conventions
9+
## Conventions
1010

1111
Fork the repo and make changes on your fork in a feature branch.
1212

@@ -28,15 +28,15 @@ comment.
2828
Commits that fix or close an issue should include a reference like `Closes #XXX`
2929
or `Fixes #XXX`, which will automatically close the issue when merged.
3030

31-
### Sign your work
31+
## Sign your work
3232

3333
The sign-off is a simple line at the end of the explanation for the
3434
patch, which certifies that you wrote it or otherwise have the right to
3535
pass it on as an open-source patch. The rules are pretty simple: if you
3636
can certify the below (from
3737
[developercertificate.org](https://developercertificate.org/)):
3838

39-
```
39+
```text
4040
Developer Certificate of Origin
4141
Version 1.1
4242
@@ -77,42 +77,41 @@ By making a contribution to this project, I certify that:
7777

7878
then you just add a line to every git commit message:
7979

80-
Signed-off-by: Joe Smith <[email protected]>
80+
`Signed-off-by: Joe Smith <[email protected]>`
8181

8282
using your real name (sorry, no pseudonyms or anonymous contributions.) and an
8383
e-mail address under which you can be reached (sorry, no github noreply e-mail
8484
addresses (such as [email protected]) or other non-reachable
8585
addresses are allowed).
8686

87-
#### Small patch exception
87+
### Small patch exception
8888

8989
There are several exceptions to the signing requirement. Currently these are:
9090

91-
* Your patch fixes spelling or grammar errors.
92-
* Your patch is a single line change to documentation.
91+
- Your patch fixes spelling or grammar errors.
92+
- Your patch is a single line change to documentation.
9393

9494
## Community Guidelines
9595

9696
We want to keep the openHAB community awesome, growing and collaborative. We
9797
need your help to keep it that way. To help with this we've come up with some
9898
general guidelines for the community as a whole:
9999

100-
* Be nice: Be courteous, respectful and polite to fellow community members: no
100+
- Be nice: Be courteous, respectful and polite to fellow community members: no
101101
regional, racial, gender, or other abuse will be tolerated. We like nice people
102102
way better than mean ones!
103103

104-
* Encourage diversity and participation: Make everyone in our community
104+
- Encourage diversity and participation: Make everyone in our community
105105
feel welcome, regardless of their background and the extent of their
106106
contributions, and do everything possible to encourage participation in
107107
our community.
108108

109-
* Keep it legal: Basically, don't get us in trouble. Share only content that
109+
- Keep it legal: Basically, don't get us in trouble. Share only content that
110110
you own, do not share private or sensitive information, and don't break the
111111
law.
112112

113-
* Stay on topic: Make sure that you are posting to the correct channel
113+
- Stay on topic: Make sure that you are posting to the correct channel
114114
and avoid off-topic discussions. Remember when you update an issue or
115115
respond to an email you are potentially sending to a large number of
116116
people. Please consider this before you update. Also remember that
117117
nobody likes spam.
118-

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ We will read about them later.
1818
Correct, this is done in the original repository of the add-on.
1919
You may want to know how to find the right file in all of those repos?
2020
This is fairly easy:
21-
on most of the documentation pages on https://openhab.org/,
21+
on most of the documentation pages on <https://openhab.org/>,
2222
you will find the following link at the bottom, which will point you directly to the file you want to improve.
2323

2424
![Contribution link to a specific page](./images/contribution_link.png)
@@ -96,4 +96,4 @@ In short, the following has to be considered:
9696
- Versions like "2.1.0" are marked by git tags.
9797
- Based on tags branches like "2.1-patch" are created, to include later discovered changes (like fixed links).
9898

99-
When a version is tagged (or updated), a static version of the website has to be generated and copied into the correct sub-folder, this is currently a manual operation described succinctly here: https://github.com/openhab/website/issues/72
99+
When a version is tagged (or updated), a static version of the website has to be generated and copied into the correct sub-folder, this is currently a manual operation described succinctly here: <https://github.com/openhab/website/issues/72>

0 commit comments

Comments
 (0)