Skip to content

Commit

Permalink
Merge pull request #2 from xoap-io/dev
Browse files Browse the repository at this point in the history
Fix: minor issues
  • Loading branch information
ssokolic authored Oct 16, 2023
2 parents 81493a7 + b11d31a commit c536bcb
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 22 deletions.
3 changes: 1 addition & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
#### Pull Request (PR) description

<!--
Replace this comment block with a description of your PR. Also, make sure you have updated the
CHANGELOG.md, see the task list below. An entry in the CHANGELOG.md is mandatory for all PRs.
Replace this comment block with a description of your PR.
-->

#### This Pull Request (PR) fixes the following issues
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/megalinter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,3 @@ jobs:
with:
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
fetch-depth: 0
- name: MegaLinter
id: ml
uses: megalinter/megalinter/flavors/[email protected]
env:
VALIDATE_ALL_CODEBASE: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DISABLE: COPYPASTE,SPELL
DISABLE_LINTERS: TERRAFORM_TERRASCAN
- name: Archive production artifacts
if: ${{ success() }} || ${{ failure() }}
uses: actions/upload-artifact@v3
with:
name: MegaLinter reports
path: |
report
mega-linter.log
4 changes: 2 additions & 2 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,8 @@ Download the registration script for the session host node:
> Be sure to run the script as administrator in PowerShell 5.1
After a few minutes, your nodes should show up as compliant in XOAP.
=======
A full list of changes in each version can be found in the [change log](CHANGELOG.md).

A full list of changes in each version can be found in the [Releases](https://github.com/xoap-io/XOAPRemoteDesktopServicesDSC/releases).

## Documentation

Expand Down
2 changes: 1 addition & 1 deletion templates/composite_resource/plasterManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@
<templateFile source='resource.schema.psm1.template' destination='${PLASTER_PARAM_project_name}.schema.psm1'/>
>>>>>>> 4399465de143dea55a2d64c24e8e4a6ef018f740
</content>
</plasterManifest>
</plasterManifest>
2 changes: 1 addition & 1 deletion templates/shared_module/plasterManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@
<file source='_dummy' destination='DSCResources\.dummy'/>
>>>>>>> 4399465de143dea55a2d64c24e8e4a6ef018f740
</content>
</plasterManifest>
</plasterManifest>

0 comments on commit c536bcb

Please sign in to comment.