Skip to content

Commit

Permalink
Merge branch 'release/11.6.0-rc' of https://github.com/AmadeusITGroup…
Browse files Browse the repository at this point in the history
…/otter into HEAD
  • Loading branch information
matthieu-crouzet committed Jan 8, 2025
2 parents 1eaf786 + f10c0c3 commit 18b50b2
Show file tree
Hide file tree
Showing 2,357 changed files with 42,365 additions and 23,593 deletions.
15 changes: 0 additions & 15 deletions .eslintignore

This file was deleted.

126 changes: 0 additions & 126 deletions .eslintrc.js

This file was deleted.

1 change: 0 additions & 1 deletion .github/.cascadingrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"$schema": "../apps/github-cascading-app/schemas/config.schema.json",
"bypassReviewers": true,
"labels": ["cascading"],
"ignoredPatterns": [
"-next$"
Expand Down
12 changes: 9 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,15 @@
## 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
# 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
# Default reviewers for Intellij extension
/apps/intellij-extension/ @OxyFlax
/apps/intellij-extension/build.gradle.kts @AmadeusITGroup/otter_admins
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
16 changes: 16 additions & 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 Expand Up @@ -115,3 +116,18 @@ jobs:
env:
lintCmd: ${{ inputs.affected && format('lint:affected --base=remotes/origin/{0}', github.base_ref || github.ref_name) || 'lint'}}
run: yarn ${{ env.lintCmd }} --configuration ci

# Check that the packaging of github-actions is still working
github-actions:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: ${{ inputs.affected && '0' || '1' }}
- name: Setup
uses: ./tools/github-actions/setup
- name: Package github actions
env:
nxCmd: ${{ inputs.affected && format('nx affected --base=remotes/origin/{0}', github.base_ref || github.ref_name) || 'nx run-many'}}
run: yarn ${{ env.nxCmd }} --target=package-github-action

Loading

0 comments on commit 18b50b2

Please sign in to comment.