Skip to content
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 17 additions & 19 deletions .github/workflows/sonar-scanner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,46 +14,44 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Configure env vars for SonarCloud scan
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
- name: Install XML validation tools
run: |
echo "::set-env name=PATH::/opt/sonar-scanner/bin:$PATH"
- name: Compute branch name
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
uses: nixel2007/branch-name@v3
sudo apt-get update
sudo apt-get install --yes libxml2-utils
- name: Verify Configurator source format
run: bash scripts/verify-configurator-format.sh
- name: Extract version
shell: bash
run: echo "##[set-output name=version;]` cat ./OpenSubsystemsLibrary/src/Configuration/Configuration.mdo | grep -oP '(?<=\<version\>).[\d|.]*'`"
id: extract_version
run: |
version=$(sed -n 's:.*<Version>\([^<]*\)</Version>.*:\1:p' ./OpenSubsystemsLibrary/src/Configuration.xml | head -1)
test -n "$version"
echo "version=$version" >> "$GITHUB_OUTPUT"

- name: SonarCloud Scan on push
- name: SonarQube Scan on push
if: github.event_name == 'push'
uses: nixel2007/sonarcloud-github-action@v1.4
uses: SonarSource/sonarqube-scan-action@v8.1.0
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
SONAR_HOST_URL: https://sonar.openbsl.ru
with:
args: >
-Dsonar.host.url=https://sonar.openbsl.ru
-Dsonar.branch.name=${{ env.BRANCH_NAME }}
-Dsonar.branch.name=${{ github.ref_name }}
-Dsonar.projectVersion=${{ steps.extract_version.outputs.version }}
- name: RSonarCloud Scan on pull request
- name: SonarQube Scan on pull request
if: github.event_name == 'pull_request'
uses: nixel2007/sonarcloud-github-action@v1.4
uses: SonarSource/sonarqube-scan-action@v8.1.0
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
SONAR_HOST_URL: https://sonar.openbsl.ru
with:
args: >
-Dsonar.projectVersion=${{ steps.extract_version.outputs.version }}
-Dsonar.host.url=https://sonar.openbsl.ru
-Dsonar.pullrequest.provider=github
-Dsonar.pullrequest.github.repository=${{ github.repository }}
-Dsonar.pullrequest.github.token.secured=${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/.metadata/
/build/
/build/
ConfigDumpInfo.xml
DumpFilesIndex.txt
18 changes: 0 additions & 18 deletions OpenSubsystemsLibrary.Tests/.project

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions OpenSubsystemsLibrary.Tests/DT-INF/PROJECT.PMF

This file was deleted.

34 changes: 34 additions & 0 deletions OpenSubsystemsLibrary.Tests/src/Catalogs/Users.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.20">
<Catalog uuid="503bef7f-bede-4605-b3ec-c3b4dcdb6af0">
<InternalInfo>
<xr:GeneratedType name="CatalogObject.Users" category="Object">
<xr:TypeId>eb1b0a23-76b3-41b4-b814-11e39ab9c579</xr:TypeId>
<xr:ValueId>4193f24b-bc98-4819-a92e-d3267afa7196</xr:ValueId>
</xr:GeneratedType>
<xr:GeneratedType name="CatalogRef.Users" category="Ref">
<xr:TypeId>7bb1cc45-493b-4d76-ae0d-56922b662e18</xr:TypeId>
<xr:ValueId>3e7faf86-9c45-44af-9f2d-462348bd22d7</xr:ValueId>
</xr:GeneratedType>
<xr:GeneratedType name="CatalogSelection.Users" category="Selection">
<xr:TypeId>c3fd7fef-b3da-449d-a437-c59697f18553</xr:TypeId>
<xr:ValueId>7b0532a9-89c0-4cad-be7c-921310b9768a</xr:ValueId>
</xr:GeneratedType>
<xr:GeneratedType name="CatalogList.Users" category="List">
<xr:TypeId>f1d3456f-da71-43ba-b106-e6fe8ba49c63</xr:TypeId>
<xr:ValueId>f3db3d98-b64a-4289-8fb9-8ccf108fb365</xr:ValueId>
</xr:GeneratedType>
<xr:GeneratedType name="CatalogManager.Users" category="Manager">
<xr:TypeId>bdb968f5-83e1-4eb8-b830-1c1e5a026659</xr:TypeId>
<xr:ValueId>af3914ce-cebe-4088-8d94-4f975e1d6446</xr:ValueId>
</xr:GeneratedType>
</InternalInfo>
<Properties>
<ObjectBelonging>Adopted</ObjectBelonging>
<Name>Users</Name>
<Comment/>
<ExtendedConfigurationObject>a71d6813-e02b-46cf-8fb5-c5c59da1b855</ExtendedConfigurationObject>
</Properties>
<ChildObjects/>
</Catalog>
</MetaDataObject>
15 changes: 0 additions & 15 deletions OpenSubsystemsLibrary.Tests/src/Catalogs/Users/Users.mdo

This file was deleted.

24 changes: 24 additions & 0 deletions OpenSubsystemsLibrary.Tests/src/CommonForms/Test_Diagnostic.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.20">
<CommonForm uuid="b788bbe0-853c-4dbe-95b7-059983b97a47">
<Properties>
<Name>Test_Diagnostic</Name>
<Synonym>
<v8:item>
<v8:lang>en</v8:lang>
<v8:content>Diagnostic</v8:content>
</v8:item>
</Synonym>
<Comment/>
<FormType>Managed</FormType>
<IncludeHelpInContents>false</IncludeHelpInContents>
<UsePurposes>
<v8:Value xsi:type="app:ApplicationUsePurpose">PlatformApplication</v8:Value>
<v8:Value xsi:type="app:ApplicationUsePurpose">MobilePlatformApplication</v8:Value>
</UsePurposes>
<UseStandardCommands>false</UseStandardCommands>
<ExtendedPresentation/>
<Explanation/>
</Properties>
</CommonForm>
</MetaDataObject>
Loading