Skip to content

Commit b74de3a

Browse files
authored
Merge pull request #276 from bci-oss/fix-documentation
Fix documentation
2 parents ef9a71f + d349626 commit b74de3a

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed

.github/workflows/codeql-scanning.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
jobs:
1515
analyze:
1616
name: Analyze
17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-latest
1818
permissions:
1919
actions: read
2020
contents: read

.github/workflows/push_request_check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
build:
1414
name: Check if passes all requirements
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-latest
1616

1717
steps:
1818
- name: Checkout project

.github/workflows/tagged_release.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ${{ matrix.os }}
1414
strategy:
1515
matrix:
16-
os: [ macos-12, windows-latest, ubuntu-20.04 ]
16+
os: [ macos-12, windows-latest, ubuntu-latest ]
1717

1818
steps:
1919
- name: Checkout project
@@ -44,25 +44,25 @@ jobs:
4444
cache-dependency-path: '**/package-lock.json'
4545

4646
- name: Set versions
47-
if: matrix.os == 'ubuntu-20.04'
47+
if: matrix.os == 'ubuntu-latest'
4848
run: |
4949
release_version=${{ github.event.inputs.release_version }}
5050
release_branch_name=${release_version%.*}.x
5151
echo "release_branch_name=$release_branch_name" >> $GITHUB_ENV
5252
5353
- name: Get glibc version
54-
if: matrix.os == 'ubuntu-20.04'
54+
if: matrix.os == 'ubuntu-latest'
5555
run: |
5656
version=$(ldd --version | head -n 1 | awk '{print $NF}')
5757
echo "GLIBC_VERSION=$version" >> $GITHUB_ENV
5858
echo "::set-output name=glibc_version::$version"
5959
6060
- name: Set antora version
61-
if: matrix.os == 'ubuntu-20.04'
61+
if: matrix.os == 'ubuntu-latest'
6262
run: yq eval -i '.version = "${{ github.event.inputs.release_version }}"' documentation/ame-guide/antora.yml
6363

6464
- name: Commit version changes and push to upstream repository
65-
if: matrix.os == 'ubuntu-20.04'
65+
if: matrix.os == 'ubuntu-latest'
6666
run: |
6767
git config --global user.email "[email protected]"
6868
git config --global user.name "github-actions"
@@ -106,7 +106,7 @@ jobs:
106106
chmod 755 backend/ame-backend-${{ github.event.inputs.release_version }}-mac
107107
108108
- name: Download aspect model service into project (Linux)
109-
if: matrix.os == 'ubuntu-20.04'
109+
if: matrix.os == 'ubuntu-latest'
110110
run: |
111111
mkdir backend
112112
@@ -175,7 +175,7 @@ jobs:
175175
working-directory: core
176176

177177
- name: Set app version (Unix)
178-
if: matrix.os == 'macos-12' || matrix.os == 'ubuntu-20.04'
178+
if: matrix.os == 'macos-12' || matrix.os == 'ubuntu-latest'
179179
run: npm version ${{ github.event.inputs.release_version }}
180180
working-directory: core
181181

@@ -190,7 +190,7 @@ jobs:
190190
working-directory: core
191191

192192
- name: Build electron app (Linux)
193-
if: matrix.os == 'ubuntu-20.04'
193+
if: matrix.os == 'ubuntu-latest'
194194
run: |
195195
npm run build:linux:prod
196196
mv electron/aspect-model-editor-v${{ github.event.inputs.release_version }}-linux.tar.gz electron/aspect-model-editor-v${{ github.event.inputs.release_version }}-linux-glibc-v${{ env.GLIBC_VERSION }}.tar.gz
@@ -224,7 +224,7 @@ jobs:
224224

225225
# Release Linux executables
226226
- name: Create GitHub release (Linux)
227-
if: ${{ (matrix.os == 'ubuntu-20.04') && (!contains( github.ref, '-rc' )) }}
227+
if: ${{ (matrix.os == 'ubuntu-latest') && (!contains( github.ref, '-rc' )) }}
228228
uses: svenstaro/upload-release-action@latest
229229
with:
230230
overwrite: true
@@ -234,7 +234,7 @@ jobs:
234234
tag: v${{ github.event.inputs.release_version }}
235235

236236
- name: Create GitHub pre-release (Linux)
237-
if: ${{ (matrix.os == 'ubuntu-20.04') && (contains( github.ref, '-rc' )) }}
237+
if: ${{ (matrix.os == 'ubuntu-latest') && (contains( github.ref, '-rc' )) }}
238238
uses: svenstaro/upload-release-action@latest
239239
with:
240240
overwrite: true

documentation/ame-guide/modules/ROOT/pages/installation.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ In case you have already an older version, uninstall it first and then install t
114114

115115
== Install the Aspect Model Editor on Mac
116116

117-
=== Step 1: Download the .app File ==
117+
=== Step 1: Download the .app File
118118

119119
* Navigate to the released assets section and download the `.app` file.
120120

121-
=== Step 2: Move the .app File to the Applications Folder ==
121+
=== Step 2: Move the .app File to the Applications Folder
122122

123123
* Find the downloaded `.app` file on your computer.
124124
* Drag and drop it into your Applications folder.

documentation/ame-guide/modules/ROOT/pages/namespace/workspace.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ The workspace is a simple folder structure on your local machine.
66
By default, the Aspect Model Editor file directory is located at following path:
77

88
* `+C:\Users\<YOUR-USER-NAME>\aspect-model-editor+` (on Windows)
9-
* `+/Users/<YOUR-USER-NAME>/aspect-model-editor+` (on Mac or Linux)
9+
* `+/Users/<YOUR-USER-NAME>/aspect-model-editor+` (on MacOs )
10+
* `+/home/<YOUR-USER-NAME>/aspect-model-editor+` (on Linux)
1011

11-
On your local file directory, you can manually add, edit, and delete the folder structure for all your Aspect Models.
12+
On your local file directory, you can manually add, edit, and delete the folder structure for all your Aspect Models.
1213

1314
Of course, this is also possible with the Aspect Model Editor. The same folder structure is displayed in the xref:getting-started/ui-overview.adoc#workspace-sidebar[Workspace sidebar].
1415

0 commit comments

Comments
 (0)