Skip to content

Commit 4842e92

Browse files
committed
Sync with DataMiner docs changes (SkylineCommunications#38)
* Sync with DataMiner docs changes * Syncing the Getting Started more to be in line with the docs * Apply suggestions from code review Co-authored-by: Marieke Goethals <94605575+MariekeGO@users.noreply.github.com> * Applying other CR remarks on other places * Update GettingStarted.md --------- Co-authored-by: Marieke Goethals <94605575+MariekeGO@users.noreply.github.com> (cherry picked from commit 5f19658)
1 parent b162e52 commit 4842e92

File tree

3 files changed

+180
-155
lines changed

3 files changed

+180
-155
lines changed

working/templates/SharedItems/.github/workflows/basic.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
if [[ -z "${{ secrets.DATAMINER_TOKEN }}" ]]; then
3030
echo "Error: DATAMINER_TOKEN is not set. Release not possible!"
3131
echo "Please create or re-use an admin.dataminer.services token by visiting: https://admin.dataminer.services/."
32-
echo "Navigate to the right Organization then go to Keys and create/find a key with permissions to Register catalog items, Download catalog versions and Read catalog items."
32+
echo "Navigate to the right organization, then go to Keys and create or find a key with permissions Register catalog items, Download catalog versions, and Read catalog items."
3333
echo "Copy the value of the token."
3434
repo_url="https://github.com/${{ github.repository }}/settings/secrets/actions"
3535
echo "Then set a DATAMINER_TOKEN secret in your repository settings: $repo_url"
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,56 @@
11
# Getting Started with Skyline DataMiner DevOps
22

3-
Welcome to the Skyline DataMiner DevOps environment!
4-
This quick-start guide will help you get up and running. It was auto-generated based on the initial project setup during creation.
3+
Welcome to the Skyline DataMiner DevOps environment!
4+
This quick-start guide will help you get up and running. It was auto-generated based on the initial project setup during creation.
55
For more details and comprehensive instructions, please visit [DataMiner Docs](https://docs.dataminer.services/).
66

77
<!--#if (CreateDataMinerPackage)-->
8-
## Creating a DataMiner Application Package
8+
## Creating a DataMiner application package
99

10-
This project was configured to create a `.dmapp` file every time you build the project.
11-
When you compile or build the project, you will find the generated `.dmapp` in the standard output folder, typically the `bin` folder of your project.
10+
This project is configured to create a .dmapp file every time you build the project.
1211

13-
When you publish the project (see Publishing topic below), a corresponding item will be created in the online DataMiner Catalog.
12+
When you compile or build the project, you will find the generated .dmapp in the standard output folder, typically the *bin* folder of your project.
13+
14+
When you publish the project, a corresponding item will be created in the online DataMiner Catalog.
1415

1516
<!--#else-->
16-
## Enabling the Creation of a DataMiner Application Package
17+
## Enabling the creation of a DataMiner application package
1718

18-
This project was not configured to generate a `.dmapp` file.
19-
To enable `.dmapp` generation, consider migrating to a multi-artifact DataMiner Application Package as described below.
19+
This project was not configured to generate a .dmapp file.
20+
To enable .dmapp generation, consider migrating to a multi-artifact DataMiner Application Package as described below.
2021

2122
<!--#endif-->
22-
## Migrating to a Multi-Artifact DataMiner Application Package
23+
## Migrating to a multi-artifact DataMiner application package
2324

24-
If you need to combine additional components in your `.dmapp` file, you should:
25+
If you need to combine additional components in your .dmapp file, you should:
2526

2627
1. Open the `$SCRIPTNAME$.csproj` file and ensure the `<GenerateDataminerPackage>` property is set to `False`.
2728

28-
2. Right-click your solution and select **Add > New Project**.
29+
1. Right-click your solution and select *Add* > *New Project*.
2930

30-
3. Select the **Skyline DataMiner Package Project** template.
31+
1. Select the *Skyline DataMiner Package Project* template.
3132

3233
Follow the provided **Getting Started** guide in the new project for further instructions.
3334

3435
<!--#if (CreateDataMinerPackage)-->
3536
## Publishing to the Catalog
3637

37-
This project was created with support for publishing to the DataMiner Catalog.
38+
This project was created with support for publishing to the DataMiner Catalog.
3839
You can publish your artifact either manually via the Visual Studio IDE or by setting up a CI/CD workflow.
3940
<!--#endif-->
4041
<!--#if (IsCatalogNoCICD)-->
4142

42-
### Manual Publishing
43+
### Publishing manually
44+
45+
1. Obtain an **organization key** from [admin.dataminer.services](https://admin.dataminer.services/) with the following scopes:
4346

44-
1. Obtain an **Organization Key** from [admin.dataminer.services](https://admin.dataminer.services/) with the following scopes:
45-
- **Register catalog items**
46-
- **Read catalog items**
47-
- **Download catalog versions**
47+
- *Register catalog items*
48+
- *Read catalog items*
49+
- *Download catalog versions*
4850

4951
1. Securely store the key using Visual Studio User Secrets:
5052

51-
1. Right-click the project and select **Manage User Secrets**.
53+
1. Right-click the project and select *Manage User Secrets*.
5254

5355
1. Add the key in the following format:
5456

@@ -62,70 +64,77 @@ You can publish your artifact either manually via the Visual Studio IDE or by se
6264
}
6365
```
6466

65-
1. Publish the package by right-clicking your project in Visual Studio and then selecting the **Publish** option.
67+
1. Publish the package by right-clicking your project in Visual Studio and then selecting the *Publish* option.
68+
69+
This will open a new window, where you will find a Publish button and a link where your item will eventually be registered.
6670

67-
This will open a new window, where you will find a *Publish* button and a link where your item will eventually be registered.
71+
> [!NOTE]
72+
> To safeguard the quality of your product, consider using a CI/CD setup to run *dotnet publish* only after passing quality checks.
6873

69-
**Recommendation:** To safeguard the quality of your product, consider using a CI/CD setup to run **dotnet publish** only after passing quality checks.
74+
### Changing the version of a package
7075

71-
### Changing the Version
76+
There are two ways to change the version of a package:
7277

73-
1. Navigate to your project in Visual Studio, right-click, and select Properties.
78+
- By adjusting the package version property:
7479

75-
1. Search for Package Version.
80+
1. Navigate to your project in Visual Studio, right-click, and select *Properties*.
7681

77-
1. Adjust the value as needed.
82+
1. Search for *Package Version*.
7883

79-
### Changing the Version - Alternative
84+
1. Adjust the value as needed.
8085

81-
1. Navigate to your project in Visual Studio and double-click it.
86+
- By adjusting the *Version* XML tag:
8287

83-
1. Adjust the "Version" XML tag to the version you want to register.
88+
1. Navigate to your project in Visual Studio and double-click it.
8489

85-
```xml
86-
<Version>1.0.1</Version>
87-
```
90+
1. Adjust the *Version* XML tag to the version you want to register.
91+
92+
```xml
93+
<Version>1.0.1</Version>
94+
```
8895

8996
<!--#elseif (IsCatalogBasicCICD)-->
90-
## Publishing to the Catalog with Basic CI/CD Workflow
97+
## Publishing to the Catalog with basic CI/CD workflow
98+
99+
This project includes a basic GitHub workflow for Catalog publishing.
91100

92-
This project includes a basic GitHub workflow for Catalog publishing.
93101
Follow these steps to set it up:
94102

95-
1. Create a GitHub repository by going to **Git > Create Git Repository**, selecting GitHub, and filling in the wizard before clicking **Create and Push**.
103+
1. Create a GitHub repository by going to *Git* > *Create Git Repository* in Visual Studio, selecting GitHub, and filling in the wizard before clicking *Create and Push*.
96104

97105
1. In GitHub, go to the *Actions* tab.
98106

99107
1. Click the workflow run that failed (usually called *Add project files*).
100108

101-
1. Click the "build" step that failed and read the failing error.
109+
1. Click the "build" step that failed and read the error.
102110

103111
``` text
104112
Error: DATAMINER_TOKEN is not set. Release not possible!
105113
Please create or re-use an admin.dataminer.services token by visiting: https://admin.dataminer.services/.
106-
Navigate to the right Organization then go to Keys and create/find a key with permissions to Register Catalog Items.
114+
Navigate to the right organization, then go to Keys and create or find a key with permissions Register catalog items, Download catalog versions, and Read catalog items.
107115
Copy the value of the token.
108116
Then set a DATAMINER_TOKEN secret in your repository settings: **Dynamic Link**
109117
```
110118

111119
You can use the links from the actual error to better address the next couple of steps.
112120

113-
1. Obtain an **Organization Key** from [admin.dataminer.services](https://admin.dataminer.services/) with the following scopes:
114-
- **Register catalog items**
115-
- **Read catalog items**
116-
- **Download catalog versions**
121+
1. Obtain an **organization key** from [admin.dataminer.services](https://admin.dataminer.services/) with the following scopes:
122+
123+
- *Register catalog items*
124+
- *Read catalog items*
125+
- *Download catalog versions*
117126

118-
1. Add the key as a secret in your GitHub repository, by navigating to **Settings > Secrets and variables > Actions** and creating a secret named `DATAMINER_TOKEN`.
127+
1. Add the key as a secret in your GitHub repository, by navigating to *Settings* > *Secrets and variables* > *Actions* and creating a secret named `DATAMINER_TOKEN`.
119128

120129
1. Re-run the workflow.
121130

122131
With this setup, any push with new content (including the initial creation) to the main/master branch will generate a new pre-release version, using the latest commit message as the version description.
123132

124-
### Releasing a Specific Version
133+
### Releasing a specific version
125134

126-
1. Navigate to the **<> Code** tab in your GitHub repository.
135+
1. Navigate to the *<> Code* tab in your GitHub repository.
127136

128-
1. In the menu on the right, select **Releases**.
137+
1. In the menu on the right, select *Releases*.
129138

130139
1. Create a new release, select the desired version as a **tag**, and provide a title and description.
131140

@@ -134,17 +143,15 @@ With this setup, any push with new content (including the initial creation) to t
134143
135144
<!--#elseif (IsCatalogCompleteCICD)-->
136145

137-
## Publishing to the Catalog with Complete CI/CD Workflow
146+
## Publishing to the Catalog with complete CI/CD workflow
138147

139148
This project includes a comprehensive GitHub workflow that adheres to Skyline Communications' quality standards, including static code analysis, custom validation, and unit testing.
140149

141-
### Prerequisite
150+
1. Make sure you have a **SonarCloud organization**.
142151

143-
You need a **SonarCloud Organization**. If you don’t have one, you can create it [here](https://sonarcloud.io/create-organization).
152+
If you do not have one yet, you can create it on [sonarcloud.io](https://sonarcloud.io/create-organization).
144153

145-
### Steps
146-
147-
1. Create a GitHub repository by going to **Git > Create Git Repository**, selecting GitHub, and filling in the wizard before clicking **Create and Push**.
154+
1. Create a GitHub repository by going to *Git* > *Create Git Repository* in Visual Studio, selecting GitHub, and filling in the wizard before clicking *Create and Push*.
148155

149156
1. In GitHub, go to the *Actions* tab.
150157

@@ -155,19 +162,20 @@ You need a **SonarCloud Organization**. If you don’t have one, you can create
155162
``` text
156163
Error: DATAMINER_TOKEN is not set. Release not possible!
157164
Please create or re-use an admin.dataminer.services token by visiting: https://admin.dataminer.services/.
158-
Navigate to the right Organization then go to Keys and create/find a key with permissions to Register catalog items, Download catalog versions and Read catalog items.
165+
Navigate to the right organization, then go to Keys and create or find a key with permissions Register catalog items, Download catalog versions, and Read catalog items.
159166
Copy the value of the token.
160167
Then set a DATAMINER_TOKEN secret in your repository settings: **Dynamic Link**
161168
```
162169

163170
You can use the links from the actual error to better address the next couple of steps.
164171

165-
1. Obtain an **Organization Key** from [admin.dataminer.services](https://admin.dataminer.services/) with the following scopes:
166-
- **Register catalog items**
167-
- **Read catalog items**
168-
- **Download catalog versions**
172+
1. Obtain an **organization key** from [admin.dataminer.services](https://admin.dataminer.services/) with the following scopes:
173+
174+
- *Register catalog items*
175+
- *Read catalog items*
176+
- *Download catalog versions*
169177

170-
1. Add the key as a secret in your GitHub repository, by navigating to **Settings > Secrets and variables > Actions** and creating secrets or variables with the required names.
178+
1. Add the key as a secret in your GitHub repository, by navigating to *Settings* > *Secrets and variables* > *Actions* and creating secrets or variables with the required names.
171179

172180
1. Re-run the workflow.
173181

@@ -179,21 +187,21 @@ The following secrets and variables will have been added to your repository afte
179187
| `SONAR_TOKEN` | Secret | Token for SonarCloud authentication | Obtain from [SonarCloud Security](https://sonarcloud.io/account/security) and add it as a secret. |
180188
| `SONAR_NAME` | Variable | SonarCloud project ID | Visit [SonarCloud](https://sonarcloud.io/projects/create), copy the project ID, and add it as a variable. |
181189

182-
### Releasing a Version
190+
### Releasing a version
183191

184-
1. Navigate to the **<> Code** tab in your GitHub repository.
192+
1. Navigate to the *<> Code* tab in your GitHub repository.
185193

186-
1. In the menu on the right, select **Releases**.
194+
1. In the menu on the right, select *Releases*.
187195

188196
1. Create a new release, select the desired version as a **tag**, and provide a title and description.
189197

190198
> [!NOTE]
191199
> The description will be visible in the DataMiner Catalog.
192200
193201
<!--#else-->
194-
## Enabling Publishing to the Catalog
202+
## Enabling publishing to the Catalog
195203

196-
This project was created without support for publishing to the DataMiner Catalog.
197-
To enable this, add a **Skyline DataMiner Package Project** to your solution and follow the **Getting Started** guide provided in that project.
204+
This project was created without support for publishing to the DataMiner Catalog.
205+
To enable this, add a *Skyline DataMiner Package Project* to your solution and follow the **Getting Started** guide provided in that project.
198206

199207
<!--#endif-->

0 commit comments

Comments
 (0)