Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add pre-commit #736

Open
wants to merge 14 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
Expand Down Expand Up @@ -46,9 +46,9 @@

###############################################################################
# diff behavior for common document formats
#
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
Expand All @@ -72,4 +72,4 @@
#*.wixproj -text merge=union
#*.modelproj -text merge=union
#*.sqlproj -text merge=union
#*.wwaproj -text merge=union
#*.wwaproj -text merge=union
11 changes: 6 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ about: Create a report to help us improve
title: "[BUG]"
labels: bug, question
assignees: PTKu

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -24,10 +24,11 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. Microsoft Windows [Version 10.0.18363.1082]]
- Visual Studio version [e.g. Microsoft Visual Studio Professional 2019 Version 16.7.3]
- TwinCAT3 version [eg. 4024.10]
- Version [e.g. 22]

- OS: [e.g. Microsoft Windows [Version 10.0.18363.1082]]
- Visual Studio version [e.g. Microsoft Visual Studio Professional 2019 Version 16.7.3]
- TwinCAT3 version [eg. 4024.10]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
2 changes: 0 additions & 2 deletions .github/ISSUE_TEMPLATE/documentation_issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ about: Create a report to help us improve the documentation
title: "[DOCUMENTATION]"
labels: documentation
assignees: TomKovac

---

**Describe the documentation issue**
What are you missing in the documentantion, please be specific about topic or theme.

**Provide links**
Provide link to existing documentation where you would like to see changes or fixies.

3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Feature request
about: Suggest an idea for this project
title: "[NEW-FEATURE]"
labels: feature-request
assignees: ''

assignees: ""
---

**Is your feature request related to a problem? Please describe.**
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Ask question
title: "[QUESTION]"
labels: question
assignees: PTKu

---

# State topic of your question
Expand Down
5 changes: 2 additions & 3 deletions .github/ISSUE_TEMPLATE/suggestion.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
name: Suggestion
about: Suggest an idea for this project
title: "[IDEA]"
labels: ''
assignees: ''

labels: ""
assignees: ""
---

**Is your suggestion related to a problem? Please describe.**
Expand Down
9 changes: 5 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ Please describe the tests that you ran to verify your changes. Provide instructi
- [ ] Test B

**Test Configuration**:
* Firmware version:
* Hardware:
* Toolchain:
* SDK:

- Firmware version:
- Hardware:
- Toolchain:
- SDK:

# Checklist:

Expand Down
4 changes: 2 additions & 2 deletions .github/issue-branch.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mode: chatops
branchName: '${issue.number}-${issue.title}'
openDraftPR: true
branchName: "${issue.number}-${issue.title}"
openDraftPR: true
26 changes: 13 additions & 13 deletions .github/workflows/create_issue.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
on:
issues:
types: [assigned]
issue_comment:
types: [created]
pull_request:
types: [closed]
issues:
types: [assigned]
issue_comment:
types: [created]
pull_request:
types: [closed]

jobs:
create_issue_branch_job:
runs-on: ubuntu-latest
steps:
- name: Create Issue Branch
uses: robvanderleek/create-issue-branch@main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
create_issue_branch_job:
runs-on: ubuntu-latest
steps:
- name: Create Issue Branch
uses: robvanderleek/create-issue-branch@main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24 changes: 12 additions & 12 deletions .github/workflows/docu.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Documentation

on:
on:
workflow_dispatch:
jobs:
build:
Expand All @@ -20,19 +20,19 @@ jobs:
path: docu/TcOpen.Documentation
token: ${{ secrets.TC_OPEN_GROUP_USER_PAT }}
###
- name : Build TcOpen
- name: Build TcOpen
run: |
cd docu/TcOpen
git fetch --unshallow
.\pipelines\runbuild.ps1 -properties @{"buildConfig" = "Release"; "updateAssemblyInfo" = $true}
cd ..\..
cd docu/TcOpen
git fetch --unshallow
.\pipelines\runbuild.ps1 -properties @{"buildConfig" = "Release"; "updateAssemblyInfo" = $true}
cd ..\..
###
- name : Build TcOpen.Documentation
- name: Build TcOpen.Documentation
env:
TC_OPEN_GROUP_USER_PAT: ${{ secrets.TC_OPEN_GROUP_USER_PAT }}
run: |
cd docu/TcOpen.Documentation
dotnet build
git add -A
git commit -m "Automated update of documentation"
git push "https://token:$env:TC_OPEN_GROUP_USER_PAT@github.com/TcOpenGroup/TcOpen.Documentation.git"
cd docu/TcOpen.Documentation
dotnet build
git add -A
git commit -m "Automated update of documentation"
git push "https://token:$env:TC_OPEN_GROUP_USER_PAT@github.com/TcOpenGroup/TcOpen.Documentation.git"
44 changes: 22 additions & 22 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
name: dev

on:
on:
push:
branches :
branches:
- dev
pull_request:
pull_request:
paths:
- 'src/**'
- 'pipelines/**'
- '.github/**'
- "src/**"
- "pipelines/**"
- ".github/**"
workflow_dispatch:
jobs:
build:
runs-on: self-hosted
timeout-minutes: 180
steps:
- uses: actions/checkout@v2
with :
path : '.'
with:
path: "."
fetch-depth: 0
- name: Run Psake
env:
_PK_PHOENY_ : ${{ secrets._PK_PHOENY_ }}
_TK_PHOENY_ : ${{ secrets._TK_PHOENY_ }}
_TW_PHOENY : ${{ secrets._TW_PHOENY }}
_TW_TOKEN_ : ${{ secrets._TW_TOKEN_ }}
_TW_USER_ : ${{ secrets._TW_USER_ }}
_PK_PHOENY_: ${{ secrets._PK_PHOENY_ }}
_TK_PHOENY_: ${{ secrets._TK_PHOENY_ }}
_TW_PHOENY: ${{ secrets._TW_PHOENY }}
_TW_TOKEN_: ${{ secrets._TW_TOKEN_ }}
_TW_USER_: ${{ secrets._TW_USER_ }}
run: >
.\pipelines\runbuild.ps1 -properties
.\pipelines\runbuild.ps1 -properties
@{
"buildConfig" = "Release";
"updateAssemblyInfo" = $true;
"testingStrength" = 1;
"isTestingEnabled" = $true;
"packNugets" = $false;
}
- name : Create Tag
if : env.BuildNumber && success() && github.event_name != 'pull_request'
run : |
- name: Create Tag
if: env.BuildNumber && success() && github.event_name != 'pull_request'
run: |
git config --global user.email "gh-action@tcopengroup.com"
git config --global user.name "gh-action"
$tag = "GH-${{github.run_id}}-${{env.BuildNumber}}"
git tag $tag
git tag $tag
git push --tags
continue-on-error: true
- name: Test Report
uses: dorny/test-reporter@v1
if: success() || failure()
with:
name: Test report
path: '**/TestResults/*.xml'
path: "**/TestResults/*.xml"
reporter: dotnet-trx
- name: Upload PLC libraries
uses: actions/upload-artifact@v2
if: success()
uses: actions/upload-artifact@v2
if: success()
with:
name: plcLibs
name: plcLibs
path: ${{ github.workspace }}\plcLibs\*.library
48 changes: 24 additions & 24 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
name: nightly

on:
workflow_dispatch :
branches :
on:
workflow_dispatch:
branches:
- dev
schedule:
- cron: '0 0 * * *'
- cron: "0 0 * * *"

jobs:
build:
runs-on: self-hosted
timeout-minutes: 180
steps:
- uses: actions/checkout@v2
with :
path : '.'
with:
path: "."
fetch-depth: 0
- name: Run Psake
env:
_PK_PHOENY_ : ${{ secrets._PK_PHOENY_ }}
_TK_PHOENY_ : ${{ secrets._TK_PHOENY_ }}
_TW_PHOENY : ${{ secrets._TW_PHOENY }}
_TW_TOKEN_ : ${{ secrets._TW_TOKEN_ }}
_TW_USER_ : ${{ secrets._TW_USER_ }}
_PK_PHOENY_: ${{ secrets._PK_PHOENY_ }}
_TK_PHOENY_: ${{ secrets._TK_PHOENY_ }}
_TW_PHOENY: ${{ secrets._TW_PHOENY }}
_TW_TOKEN_: ${{ secrets._TW_TOKEN_ }}
_TW_USER_: ${{ secrets._TW_USER_ }}
run: >
.\pipelines\runbuild.ps1 -properties
.\pipelines\runbuild.ps1 -properties
@{
"buildConfig" = "Release";
"updateAssemblyInfo" = $true;
"isTestingEnabled" = $true;
"testingStrength" = 10;
"packNugets" = $true;
}
- name : Create Tag
if : env.BuildNumber && success() && github.event_name != 'pull_request'
run : |
- name: Create Tag
if: env.BuildNumber && success() && github.event_name != 'pull_request'
run: |
git config --global user.email "gh-action@tcopengroup.com"
git config --global user.name "gh-action"
$tag = "GH-${{github.run_id}}-${{env.BuildNumber}}"
git tag $tag
git tag $tag
git push --tags
continue-on-error: true
- name: Test Report
uses: dorny/test-reporter@v1
if: success() || failure()
with:
name: Test report
path: '**/TestResults/*.xml'
reporter: dotnet-trx
path: "**/TestResults/*.xml"
reporter: dotnet-trx
- name: Upload NuGets artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v2
if: success()
with:
name: nugets
path: ${{ github.workspace }}/nugets/*.nupkg
- name: Upload PLC libraries
uses: actions/upload-artifact@v2
if: success()
uses: actions/upload-artifact@v2
if: success()
with:
name: plcLibs
path: ${{ github.workspace }}\plcLibs\*.library
path: ${{ github.workspace }}\plcLibs\*.library
- name: Cake-Draft-Release-OrgsNugets
env:
TC_OPEN_GROUP_USER_PAT : ${{ secrets.TC_OPEN_GROUP_USER_PAT }}
TC_OPEN_GROUP_USER_PAT: ${{ secrets.TC_OPEN_GROUP_USER_PAT }}
run: >
.\pipelines\release-to-gh.ps1
.\pipelines\release-to-gh.ps1
Loading
Loading