Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main to otter training #2636

Merged
merged 49 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
0d13068
ci: check releases
fpaul-1A Sep 16, 2024
de3b8bb
fix: add search exclusion and TS options
kpanot Dec 9, 2024
5cb8aeb
fix: add search exclusion and TS options (#2571)
kpanot Dec 9, 2024
5e055ff
feat: add NX_PARALLEL environment variable
kpanot Dec 10, 2024
075466d
ci: check releases (#2170)
fpaul-1A Dec 10, 2024
8e0ba50
chore: set peer-dependencies to carect
kpanot Dec 9, 2024
b92766f
feat: add NX_PARALLEL environment variable (#2577)
kpanot Dec 10, 2024
06f004a
chore: set peer-dependencies to caret (#2569)
kpanot Dec 11, 2024
4a33dce
fix: vscode watcher issue with ts upgrade
kpanot Dec 11, 2024
f9e58b4
fix(ama-sdk-create): publish training sdk on verdaccio for it tests o…
matthieu-crouzet Dec 5, 2024
e1f959b
fix(ama-sdk-create): publish training sdk on verdaccio for it tests o…
mrednic-1A Dec 12, 2024
34ba147
fix: remove pattern for ref property in localization.metadata.schema.…
guillaumerochelle Dec 12, 2024
8dbc759
Merge branch 'main' into cascading/11.5.0-main
mrednic-1A Dec 12, 2024
a710d1e
fix: remove duplicate publish due to cascading
mrednic-1A Dec 12, 2024
681ec8b
fix: remove pattern for ref property in localization.metadata.schema.…
mrednic-1A Dec 12, 2024
b2ab845
Merge release/11.5 into cascading/11.5.0-main
otter-cascading[bot] Dec 12, 2024
98c0c6b
[cascading] from release/11.5 to main (#2583)
mrednic-1A Dec 12, 2024
b8b7c51
chore: remove reference in pom.xml version
cpaulve-1A Dec 12, 2024
65931d3
fix: vscode watcher issue with ts upgrade (#2578)
kpanot Dec 12, 2024
63b95b3
fix(tools): path to release script
kpanot Dec 12, 2024
c141c26
chore: add codeowners for CMS specifications
kpanot Dec 13, 2024
5835ff0
fix(tools): path to release script (#2588)
kpanot Dec 13, 2024
3c097e5
chore: remove reference in pom.xml version (#2585)
cpaulve-1A Dec 13, 2024
900f7a1
fix: ignore nx links as invalid links
cpaulve-1A Dec 9, 2024
3997bea
feat(design): explode complex types
kpanot Dec 12, 2024
5afd536
[cascading] from release/11.5 to main (#2592)
kpanot Dec 14, 2024
f2582c5
fix(deps): update dependency @formatjs/intl-numberformat to ~8.15.0
renovate[bot] Dec 14, 2024
cffe0d1
chore: add codeowners for CMS specifications (#2595)
kpanot Dec 16, 2024
5509dbe
fix(deps): update dependency @formatjs/intl-numberformat to ~8.15.0 (…
matthieu-crouzet Dec 16, 2024
2a3f7d6
chore(deps): lock file maintenance
renovate[bot] Dec 16, 2024
82e621d
docs: ignore nx links as invalid links (#2574)
cpaulve-1A Dec 16, 2024
ebd320a
chore(deps): lock file maintenance (#2598)
kpanot Dec 16, 2024
56eae2b
feat(design): explode complex types (#2589)
kpanot Dec 16, 2024
607469a
chore: fork nx tsc executor to fix issue on windows
fpaul-1A Dec 11, 2024
cd1fcad
chore: upgrade Nx dependencies (#2513)
fpaul-1A Dec 16, 2024
13e487e
feat(design): add description to the exploded tokens
kpanot Dec 17, 2024
2125b51
feat(design): add description to the exploded tokens (#2603)
kpanot Dec 17, 2024
a72ba7a
fix: jest.config.ut.js not processing array in tsconfig paths correctly
divdavem Dec 17, 2024
6a9e0da
fix: jest.config.ut.js not processing array in tsconfig paths correct…
kpanot Dec 17, 2024
aa07319
chore: remove index.js files for builders
fpaul-1A Dec 17, 2024
711beaa
fix: add missing dev dependency
kpanot Dec 18, 2024
8de7221
fix: add missing dev dependency (#2607)
kpanot Dec 18, 2024
5edde0f
chore: remove index.js files for builders (#2604)
fpaul-1A Dec 18, 2024
acb451a
fix: linter issue with typescript-eslint 8.18
fpaul-1A Dec 18, 2024
b131702
fix: linter issue with typescript-eslint 8.18 (#2619)
fpaul-1A Dec 18, 2024
15dd775
fix(deps): update typescript dependencies to ~8.18.0
renovate[bot] Dec 18, 2024
21efca9
fix(deps): update typescript dependencies to ~8.18.0 (main) (#2617)
kpanot Dec 19, 2024
07016d1
chore: merge main branch into otter training
cpaulve-1A Dec 19, 2024
6f662e5
chore: fix build merge main into training
cpaulve-1A Dec 19, 2024
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
17 changes: 8 additions & 9 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@
## Default reviewers for Anayltics build metrics webpack plugin
# /packages/@o3r/analytics/plugins/webpack/build-metrics @rglearns

## Default reviewers for AEM Plugin JSON Schemas
# /packages/@o3r/application/schemas/ @guillaume-goulet
# /packages/@o3r/localization/schemas/ @guillaume-goulet
# /packages/@o3r/configuration/schemas/ @guillaume-goulet
# /packages/@o3r/components/schemas/ @guillaume-goulet
# /packages/@o3r/dynamic-content/schemas/ @guillaume-goulet
# /packages/@o3r/extractors/schemas/ @guillaume-goulet
# /packages/@o3r/rules-engine/schemas/ @guillaume-goulet

# Default reviewers for CMS Plugin JSON Schemas
/packages/@o3r/application/schemas/ @AmadeusITGroup/otter_cms
/packages/@o3r/localization/schemas/ @AmadeusITGroup/otter_cms
/packages/@o3r/configuration/schemas/ @AmadeusITGroup/otter_cms
/packages/@o3r/components/schemas/ @AmadeusITGroup/otter_cms
/packages/@o3r/dynamic-content/schemas/ @AmadeusITGroup/otter_cms
/packages/@o3r/extractors/schemas/ @AmadeusITGroup/otter_cms
/packages/@o3r/rules-engine/schemas/ @AmadeusITGroup/otter_cms

# Default reviewers for Intellij extension
/apps/intellij-extension/ @OxyFlax
Expand Down
6 changes: 6 additions & 0 deletions .github/check-release-issue-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
title: Some releases are failing the automated checks
labels: bug
---
On {{ date | date('D MMM YYYY') }} some releases failed the automated checks.
Check the [action result]({{ env.RUN_URL }}).
3 changes: 3 additions & 0 deletions .github/markdown-external-links.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
},
{
"pattern": "^https?://(127.0.0.1|localhost)[:/].*"
},
{
"pattern": "^https://cloud.nx.app/*"
}
],
"replacementPatterns": [
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/audit.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
name: NPM Audit

concurrency:
group: ci-${{ github.ref }}-audit
group: ci-${{ github.ref }}-${{ inputs.ref }}-audit
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

on:
workflow_call:
inputs:
ref:
type: string
default: ''
description: The branch, tag or SHA to checkout.
push:
branches:
- main
Expand All @@ -25,6 +30,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ inputs.ref }}
- name: Setup
uses: ./tools/github-actions/setup
- name: Audit
Expand Down
78 changes: 78 additions & 0 deletions .github/workflows/check-all-releases.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: Check all releases (latest patch of each minor version for the last 3 majors)

on:
workflow_dispatch:
performAudit:
type: boolean
default: true
description: Run Audit
performITTests:
type: boolean
default: false
description: Run IT Tests
schedule:
- cron: "0 0 * * 6"

permissions:
contents: read
issues: write

jobs:
findTags:
runs-on: ubuntu-latest
outputs:
tags: ${{ steps.getTags.outputs.TAGS }}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
fetch-tags: true
- name: Get the latest patch of each minor version for the last 3 majors
run: |
# Extract all releases
RELEASE_TAG_PATTERN="^v[0-9]+\.[0-9]+\.[0-9]+$"
ALL_RELEASES=$(git tag -l | sort -V | grep -E $RELEASE_TAG_PATTERN)
SUPPORTED_MAJORS=$(echo $ALL_RELEASES | tr ' ' '\n' | awk -F. '{print $1}' | uniq | tail -n 3)
ALL_SUPPORTED_RELEASES=$(echo $ALL_RELEASES | tr ' ' '\n' | grep -E "^($(echo $SUPPORTED_MAJORS | tr ' ' '|'))\.")
echo "Supported releases: $ALL_SUPPORTED_RELEASES"

# Take the latest minor for each previous major version
LATEST_MINOR_OF_EACH_MAJOR=$(echo $ALL_SUPPORTED_RELEASES | tr ' ' '\n' | awk -F. '{print $1}' | uniq | xargs -I {} sh -c "echo '$ALL_SUPPORTED_RELEASES' | grep -E '^{}.*' | tail -n 1" | head -n -1)
echo "Found latest minor of each major versions: $LATEST_MINOR_OF_EACH_MAJOR"

# Take the latest patch for each minor version of the current major
ALL_LATEST_MAJOR_RELEASES=$(echo $ALL_SUPPORTED_RELEASES | tr ' ' '\n' | awk -F. '{print $1}' | uniq | tail -n 1 | xargs -I {} sh -c "echo '$ALL_SUPPORTED_RELEASES' | grep -E '^{}.*'")
LATEST_PATCH_OF_EACH_MINOR=$(echo $ALL_LATEST_MAJOR_RELEASES | tr ' ' '\n' | awk -F. '{print $1 "." $2}' | uniq | xargs -I {} sh -c "echo '$ALL_LATEST_MAJOR_RELEASES' | grep -E '^{}.*' | tail -n 1")
echo "Found latest patch of each minor versions: $LATEST_PATCH_OF_EACH_MINOR"

# Export output in JSON format
TAGS=$(echo $LATEST_MINOR_OF_EACH_MAJOR $LATEST_PATCH_OF_EACH_MINOR | tr ' ' '\n' | awk '{print "\"" $0 "\""}' | tr '\n' ',')
echo "TAGS=[$TAGS]" >> "$GITHUB_OUTPUT"
id: getTags

checkRelease:
needs: findTags
strategy:
fail-fast: false
matrix:
tag: ${{ fromJSON(needs.findTags.outputs.tags) }}
uses: ./.github/workflows/check-release.yml
with:
ref: ${{ matrix.tag }}
performAudit: ${{ inputs.performAudit || true }}
performITTests: ${{ inputs.performITTests || false }}

report:
runs-on: ubuntu-latest
needs: checkRelease
if: failure()
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Create an issue
uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RUN_URL: ${{ format('https://github.com/{0}/actions/runs/{1}/attempts/{2}', github.repository, github.run_id, github.run_attempt || 1) }}
with:
filename: .github/check-release-issue-template.md
update_existing: true
67 changes: 67 additions & 0 deletions .github/workflows/check-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: Check release

on:
workflow_dispatch:
inputs:
ref:
type: string
required: true
description: The branch, tag or SHA to checkout.
performAudit:
type: boolean
default: true
description: Run Audit
performITTests:
type: boolean
default: false
description: Run IT Tests
workflow_call:
inputs:
ref:
type: string
default: ''
description: The branch, tag or SHA to checkout.
performAudit:
type: boolean
default: true
description: Run Audit
performITTests:
type: boolean
default: false
description: Run IT Tests
secrets:
NX_CLOUD_ACCESS_TOKEN:
required: false
description: Token to use Nx Cloud token

jobs:
auditRelease:
if: inputs.performAudit
uses: ./.github/workflows/audit.yml
with:
ref: ${{ inputs.ref }}

buildRelease:
if: inputs.performITTests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ inputs.ref }}
- uses: ./tools/github-actions/setup
- uses: ./.github/actions/setup-java
with:
install-jdk: 'true'
- run: yarn build:swagger-gen
- run: yarn build
- uses: ./tools/github-actions/upload-build-output
with:
artifactName: 'dist-${{ inputs.ref }}'

testRelease:
if: inputs.performITTests
needs: [buildRelease]
uses: ./.github/workflows/it-tests.yml
with:
ref: ${{ inputs.ref }}
skipNxCache: true
1 change: 1 addition & 0 deletions .github/workflows/code-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ on:
description: Token Report to Codecov

env:
NX_PARALLEL: ${{ vars.NX_PARALLEL }}
NX_SKIP_NX_CACHE: ${{ inputs.skipNxCache }}
YARN_ENABLE_HARDENED_MODE: 0
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
description: Token to use Nx Cloud token

env:
NX_PARALLEL: ${{ vars.NX_PARALLEL }}
NX_SKIP_NX_CACHE: ${{ inputs.skipNxCache }}
YARN_ENABLE_HARDENED_MODE: 0

Expand Down
22 changes: 18 additions & 4 deletions .github/workflows/it-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ on:
default: false
required: false
description: Skip the nx cache
ref:
type: string
default: ''
description: The branch, tag or SHA to checkout.
secrets:
NX_CLOUD_ACCESS_TOKEN:
required: false
Expand All @@ -17,6 +21,7 @@ on:
description: Token Report to Codecov

env:
NX_PARALLEL: ${{ vars.NX_PARALLEL }}
NX_SKIP_NX_CACHE: ${{ inputs.skipNxCache }}
YARN_ENABLE_HARDENED_MODE: 0

Expand All @@ -30,7 +35,11 @@ jobs:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ inputs.ref }}
- uses: ./tools/github-actions/download-build-output
with:
artifactName: ${{ inputs.ref && format('dist-{0}', inputs.ref) || 'dist' }}
- uses: ./tools/github-actions/setup
- name: Setup verdaccio once for all tests
id: setup-verdaccio
Expand All @@ -46,7 +55,7 @@ jobs:
- name: Publish verdaccio storage
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: verdaccio
name: ${{ inputs.ref && format('verdaccio-{0}', inputs.ref) || 'verdaccio' }}
path: verdaccio.zip
- name: Stop verdaccio
if: always()
Expand All @@ -67,7 +76,11 @@ jobs:
PREPARE_TEST_ENV_TYPE: ${{ matrix.testEnvironment }}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ inputs.ref }}
- uses: ./tools/github-actions/download-build-output
with:
artifactName: ${{ inputs.ref && format('dist-{0}', inputs.ref) || 'dist' }}
- uses: ./tools/github-actions/setup
- shell: bash
run: |
Expand All @@ -80,6 +93,7 @@ jobs:
run: echo "currentMonth=$(date +'%Y-%m')" >> $GITHUB_ENV
shell: bash
- name: Cache test-app yarn
if: inputs.ref == ''
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
with:
path: |
Expand All @@ -92,7 +106,7 @@ jobs:
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
name: Download verdaccio storage prepared in the previous job
with:
name: verdaccio
name: ${{ inputs.ref && format('verdaccio-{0}', inputs.ref) || 'verdaccio' }}
path: '.'
- name: Setup verdaccio once for all tests
id: setup-verdaccio
Expand Down Expand Up @@ -125,13 +139,13 @@ jobs:
if: failure() && steps.it-tests.conclusion == 'failure'
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: it-tests-${{ matrix.os }}-${{ matrix.packageManager }}
name: it-tests-${{ matrix.os }}-${{ matrix.packageManager }}-${{ inputs.ref }}
path: it-tests.zip
- name: Publish tests reports
if: always()
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: it-reports-${{ matrix.os }}-${{ matrix.packageManager }}
name: it-reports-${{ matrix.os }}-${{ matrix.packageManager }}-${{ inputs.ref }}
path: 'packages/**/dist-test/it-report.xml'
- name: Stop verdaccio
if: always() && runner.os == 'Linux'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ on:
types: [checks_requested]

env:
NX_PARALLEL: ${{ vars.NX_PARALLEL }}
YARN_ENABLE_HARDENED_MODE: 0
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ dist-lint/
tmp/
.acache/
*.tsbuildinfo
/bin

# Documentations
/documentation.json
Expand Down
1 change: 0 additions & 1 deletion .nxignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
**/src/package.json
packages/@*/*/{builders,schematics}/**/templates/**/*.ts
packages/@*/*/{builders,schematics}/**/mocks/**/*.ts
packages/@*/*/{builders,schematics}/**/index.js
packages/@*/*/build/**
!**/schematics/**/target
Loading
Loading