Skip to content

Commit 2dea1bb

Browse files
fpaul-1Afpaul-1A
committed
Merge branch 'main' of https://github.com/AmadeusITGroup/otter into feat/otter-training-rebase
2 parents 0a0cc4d + 7b2d5af commit 2dea1bb

File tree

815 files changed

+28395
-13905
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

815 files changed

+28395
-13905
lines changed

‎.eslintignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ generated-doc/
1010
/apps/*/**/templates/**
1111
/.pnp.js
1212
/.vscode
13-
/tools/github-actions/*/packaged-action/
13+
/tools/github-actions/*/packaged-action/**
1414
/**/src/**/package.json
1515
!/.yarnrc.yml

‎.eslintrc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ module.exports = {
6060
],
6161
'rules': {
6262
'@o3r/json-dependency-versions-harmonize': ['error', {
63-
ignoredPackages: ['@o3r/build-helpers'],
63+
ignoredPackages: ['@o3r/build-helpers', '@o3r/workspace-helpers'],
6464
alignPeerDependencies: false,
6565
alignEngines: true
6666
}],
@@ -81,7 +81,7 @@ module.exports = {
8181
],
8282
'rules': {
8383
'@o3r/json-dependency-versions-harmonize': ['error', {
84-
ignoredPackages: ['@o3r/build-helpers'],
84+
ignoredPackages: ['@o3r/build-helpers', '@o3r/workspace-helpers'],
8585
ignoredDependencies: ['npm'],
8686
alignPeerDependencies: false,
8787
alignEngines: true

‎.gitattributes

+6-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
*.jar binary
88
*.ico binary
99

10-
# Ignore Packaged Github Actions from the repository language detection
11-
tools/github-actions/*/packaged-action/** linguist-vendored
10+
# Ignored files from the repository language detection
1211
.yarn/** linguist-vendored
1312
*.jar linguist-vendored
13+
14+
# Generated files
15+
tools/github-actions/*/packaged-action/** linguist-generated
16+
packages/@o3r-training/showcase-sdk/src/api/** linguist-generated
17+
packages/@o3r-training/showcase-sdk/src/models/base/** linguist-generated

‎.github/.pr-labelrc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "../tools/@o3r/build-helpers/schemas/pr-labels.configuration.schema.json",
2+
"$schema": "../tools/@o3r/workspace-helpers/schemas/pr-labels.configuration.schema.json",
33
"projectLabelPrefix": "project:",
44
"ignoredProjects": [],
55
"ignoreProjectForLabels": ["cascading"]

‎.github/CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@
1414

1515
## Default reviewers for Intellij extension
1616
/apps/intellij-extension/ @OxyFlax
17+
/apps/intellij-extension/build.gradle.kts @AmadeusITGroup/otter_admins

‎.github/actions/setup-java/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ runs:
1919
with:
2020
maven-version: ${{ inputs.mvn-version }}
2121
- name: Set up JDK 17
22-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
22+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
2323
if: inputs.install-jdk == 'true'
2424
with:
2525
java-version: '17'

‎.github/pull_request_template.md

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
## Proposed change
22

3-
<!-- Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that is required for this change. -->
3+
<!--
4+
Please include a summary of the changes and the related issue.
5+
Please also include relevant motivation and context.
6+
-->
47

58
## Related issues
69

7-
- :bug: Fixes #(issue)
8-
- :rocket: Feature #(issue)
10+
<!--
11+
Please make sure to follow the [contribution guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md)
12+
-->
913

10-
<!-- Please make sure to follow the contributing guidelines on https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md -->
14+
*- No issue associated -*
15+
16+
<!-- * :bug: Fix #issue -->
17+
<!-- * :bug: Fix resolves #issue -->
18+
<!-- * :rocket: Feature #issue -->
19+
<!-- * :rocket: Feature resolves #issue -->
20+
<!-- * :octocat: Pull Request #issue -->

‎.github/workflows/audit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
audit:
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
27+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2828
- name: Setup
2929
uses: ./tools/github-actions/setup
3030
- name: Audit

‎.github/workflows/clean-cache.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# Needed to delete cache from action
1919
actions: write
2020
steps:
21-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
21+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2222
- name: Clean Branch Cache
2323
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
2424
env:

‎.github/workflows/code-check.yml

+16-11
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,14 @@ on:
1717
NX_CLOUD_ACCESS_TOKEN:
1818
required: false
1919
description: Token to use Nx Cloud token
20+
CODECOV_TOKEN:
21+
required: false
22+
description: Token Report to Codecov
2023

2124
env:
2225
NX_SKIP_NX_CACHE: ${{ inputs.skipNxCache }}
2326
YARN_ENABLE_HARDENED_MODE: 0
27+
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
2428

2529
permissions:
2630
contents: read
@@ -30,7 +34,7 @@ jobs:
3034
runs-on: ubuntu-latest
3135
continue-on-error: true
3236
steps:
33-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
37+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3438
- uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec # v1.0.15
3539
with:
3640
base-branch: 'main'
@@ -43,10 +47,8 @@ jobs:
4347
matrix:
4448
os: ${{ fromJson(github.event_name != 'push' && '["ubuntu-latest", "windows-latest"]' || '["ubuntu-latest"]') }}
4549
runs-on: ${{ matrix.os }}
46-
env:
47-
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
4850
steps:
49-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
51+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5052
with:
5153
fetch-depth: ${{ inputs.affected && '0' || '1' }}
5254
- name: Setup
@@ -55,7 +57,7 @@ jobs:
5557
with:
5658
install-jdk: 'true'
5759
- name: Cache Jest
58-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
60+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
5961
env:
6062
hash: ${{ hashFiles('package.json', 'tsconfig.base.json', 'tsconfig.build.json', 'nx.json') }}
6163
with:
@@ -71,10 +73,15 @@ jobs:
7173
env:
7274
testCmd: ${{ inputs.affected && format('test:affected --base=remotes/origin/{0}', github.base_ref || github.ref_name) || 'test'}}
7375
NODE_OPTIONS: ${{ runner.os == 'Windows' && '--max_old_space_size=4096' || '' }}
74-
run: yarn ${{ env.testCmd }}
76+
run: yarn ${{ env.testCmd }} --collectCoverage
77+
- name: Upload results to Codecov
78+
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
79+
with:
80+
flags: unittests
81+
token: ${{ secrets.CODECOV_TOKEN }}
7582
- name: Publish tests reports
7683
if: always()
77-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
84+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
7885
with:
7986
name: ut-reports-${{ matrix.os }}
8087
path: |
@@ -83,16 +90,14 @@ jobs:
8390
tools/**/dist-test/ut-report.xml
8491
lint:
8592
runs-on: ubuntu-latest
86-
env:
87-
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
8893
steps:
89-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
94+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9095
with:
9196
fetch-depth: ${{ inputs.affected && '0' || '1' }}
9297
- name: Setup
9398
uses: ./tools/github-actions/setup
9499
- name: Cache Eslint
95-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
100+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
96101
with:
97102
path: .cache/eslint
98103
key: ${{ runner.os }}-eslint-${{ hashFiles('yarn.lock') }}

‎.github/workflows/codeql.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@ jobs:
4646

4747
steps:
4848
- name: Checkout repository
49-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
49+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5050

5151
# Initializes the CodeQL tools for scanning.
5252
- name: Initialize CodeQL
53-
uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
53+
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
5454
with:
5555
languages: ${{ matrix.language }}
5656
config-file: ./.github/codeql/codeql-config.yml
5757

5858
- name: Autobuild
59-
uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
59+
uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
6060

6161
- name: Perform CodeQL Analysis
62-
uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
62+
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
6363
with:
6464
category: "/language:${{matrix.language}}"

‎.github/workflows/deploy-showcase.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
3232
steps:
3333
- name: Checkout
34-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
34+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3535
- uses: ./tools/github-actions/setup
3636
- name: build
3737
run: yarn nx build showcase

‎.github/workflows/documentation.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
build:
3636
runs-on: ubuntu-latest
3737
steps:
38-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
38+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3939
- uses: ./tools/github-actions/setup
4040
- name: Generate doc
4141
run: yarn doc:generate
@@ -46,7 +46,7 @@ jobs:
4646
run: yarn update-package ${{ inputs.docFolder }}/package.json --name ${{ inputs.packageName }} --version ${{ inputs.version }}
4747
- run: zip -q -r ${{ inputs.artifactName }}.zip "${{ inputs.docFolder }}" -x "*/node_modules/*" ".cache/*"
4848
shell: bash
49-
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
49+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
5050
with:
5151
name: ${{ inputs.artifactName }}
5252
path: ${{ inputs.artifactName }}.zip
@@ -60,7 +60,7 @@ jobs:
6060
name: azure-static-webapp
6161
url: ${{ steps.deploy.outputs.static_web_app_url }}
6262
steps:
63-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
63+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6464
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
6565
with:
6666
name: ${{ inputs.artifactName }}

‎.github/workflows/e2e-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
env:
2727
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
2828
steps:
29-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
29+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3030
- uses: ./tools/github-actions/download-build-output
3131
- uses: ./tools/github-actions/setup
3232
- run: yarn playwright install
@@ -41,7 +41,7 @@ jobs:
4141

4242
- name: Publish tests reports
4343
if: failure()
44-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
44+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
4545
with:
4646
name: e2e-report
4747
path: apps/showcase/playwright-reports

‎.github/workflows/it-tests.yml

+15-7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ on:
1212
NX_CLOUD_ACCESS_TOKEN:
1313
required: false
1414
description: Token to use Nx Cloud token
15+
CODECOV_TOKEN:
16+
required: false
17+
description: Token Report to Codecov
1518

1619
env:
1720
NX_SKIP_NX_CACHE: ${{ inputs.skipNxCache }}
@@ -26,7 +29,7 @@ jobs:
2629
env:
2730
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
2831
steps:
29-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
32+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3033
- uses: ./tools/github-actions/download-build-output
3134
- uses: ./tools/github-actions/setup
3235
- name: Setup verdaccio once for all tests
@@ -41,7 +44,7 @@ jobs:
4144
run: zip -r verdaccio.zip ./.verdaccio
4245
shell: bash
4346
- name: Publish verdaccio storage
44-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
47+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
4548
with:
4649
name: verdaccio
4750
path: verdaccio.zip
@@ -63,7 +66,7 @@ jobs:
6366
ENFORCED_PACKAGE_MANAGER: ${{ matrix.packageManager }}
6467
PREPARE_TEST_ENV_TYPE: ${{ matrix.testEnvironment }}
6568
steps:
66-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
69+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6770
- uses: ./tools/github-actions/download-build-output
6871
- uses: ./tools/github-actions/setup
6972
- shell: bash
@@ -77,7 +80,7 @@ jobs:
7780
run: echo "currentMonth=$(date +'%Y-%m')" >> $GITHUB_ENV
7881
shell: bash
7982
- name: Cache test-app yarn
80-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
83+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
8184
with:
8285
path: |
8386
.cache/test-app
@@ -106,7 +109,12 @@ jobs:
106109
shell: bash
107110
- name: Test
108111
id: it-tests
109-
run: yarn test-int
112+
run: yarn test-int --collectCoverage
113+
- name: Upload results to Codecov
114+
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
115+
with:
116+
flags: integration
117+
token: ${{ secrets.CODECOV_TOKEN }}
110118
- name: Zip generated app on failure
111119
if: failure() && steps.it-tests.conclusion == 'failure'
112120
run: |
@@ -120,13 +128,13 @@ jobs:
120128
shell: bash
121129
- name: Publish generated tests environment on failure
122130
if: failure() && steps.it-tests.conclusion == 'failure'
123-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
131+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
124132
with:
125133
name: it-tests-${{ matrix.os }}-${{ matrix.packageManager }}
126134
path: it-tests.zip
127135
- name: Publish tests reports
128136
if: always()
129-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
137+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
130138
with:
131139
name: it-reports-${{ matrix.os }}-${{ matrix.packageManager }}
132140
path: 'packages/**/dist-test/it-report.xml'

0 commit comments

Comments
 (0)