Skip to content

Commit 2f1738e

Browse files
fpaul-1Afpaul-1A
committed
Merge branch 'main' of https://github.com/AmadeusITGroup/otter into cascading/13.3.0-rc-main
2 parents 45f6af1 + bec2f99 commit 2f1738e

File tree

86 files changed

+272
-248
lines changed

Some content is hidden

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

86 files changed

+272
-248
lines changed

‎.github/workflows/audit.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
ref: ${{ inputs.ref }}
3232
- name: Setup
3333
uses: ./tools/github-actions/setup
34+
timeout-minutes: 30
3435
- name: Audit
3536
id: audit
3637
uses: ./tools/github-actions/audit

‎.github/workflows/check-release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
with:
4646
ref: ${{ inputs.ref }}
4747
- uses: ./tools/github-actions/setup
48+
timeout-minutes: 30
4849
- uses: ./.github/actions/setup-java
4950
with:
5051
install-jdk: 'true'

‎.github/workflows/code-check.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
fetch-depth: ${{ inputs.affected && '0' || '1' }}
5959
- name: Setup
6060
uses: ./tools/github-actions/setup
61+
timeout-minutes: 30
6162
- uses: ./.github/actions/setup-java
6263
with:
6364
install-jdk: 'true'
@@ -106,6 +107,7 @@ jobs:
106107
fetch-depth: ${{ inputs.affected && '0' || '1' }}
107108
- name: Setup
108109
uses: ./tools/github-actions/setup
110+
timeout-minutes: 30
109111
- name: Cache Eslint
110112
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
111113
env:
@@ -132,6 +134,7 @@ jobs:
132134
fetch-depth: ${{ inputs.affected && '0' || '1' }}
133135
- name: Setup
134136
uses: ./tools/github-actions/setup
137+
timeout-minutes: 30
135138
- name: Package github actions
136139
env:
137140
NX_BASE: ${{ format('remotes/origin/{0}', github.base_ref || github.ref_name) }}

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ jobs:
4747

4848
# Initializes the CodeQL tools for scanning.
4949
- name: Initialize CodeQL
50-
uses: github/codeql-action/init@42213152a85ae7569bdb6bec7bcd74cd691bfe41 # v3.30.9
50+
uses: github/codeql-action/init@d198d2fabf39a7f36b5ce57ce70d4942944f006e # v3.31.0
5151
with:
5252
languages: ${{ matrix.language }}
5353
config-file: ./.github/codeql/codeql-config.yml
5454

5555
- name: Autobuild
56-
uses: github/codeql-action/autobuild@42213152a85ae7569bdb6bec7bcd74cd691bfe41 # v3.30.9
56+
uses: github/codeql-action/autobuild@d198d2fabf39a7f36b5ce57ce70d4942944f006e # v3.31.0
5757

5858
- name: Perform CodeQL Analysis
59-
uses: github/codeql-action/analyze@42213152a85ae7569bdb6bec7bcd74cd691bfe41 # v3.30.9
59+
uses: github/codeql-action/analyze@d198d2fabf39a7f36b5ce57ce70d4942944f006e # v3.31.0
6060
with:
6161
category: "/language:${{matrix.language}}"

‎.github/workflows/deploy-showcase.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
- name: Checkout
3434
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3535
- uses: ./tools/github-actions/setup
36+
timeout-minutes: 30
3637
- name: build
3738
run: yarn nx build showcase
3839
- name: Setup Pages

‎.github/workflows/documentation.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
steps:
5353
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5454
- uses: ./tools/github-actions/setup
55+
timeout-minutes: 30
5556
- name: Generate doc
5657
run: yarn doc:generate
5758
- name: Generate package json

‎.github/workflows/e2e-tests.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3737
- uses: ./tools/github-actions/download-build-output
3838
- uses: ./tools/github-actions/setup
39+
timeout-minutes: 30
3940
- run: yarn playwright install
4041
- name: Run e2e tests
4142
run: |
@@ -79,6 +80,7 @@ jobs:
7980
with:
8081
visualTestingReportPath: apps/showcase/playwright-reports/visual-testing/report.json
8182
- uses: ./tools/github-actions/setup
83+
timeout-minutes: 30
8284
if: ${{ steps.update-e2e-screenshots.outputs.screenshots != '0' }}
8385
- name: Create branch for e2e screenshots
8486
if: ${{ steps.update-e2e-screenshots.outputs.screenshots != '0' }}

‎.github/workflows/it-tests.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
with:
4646
artifactName: ${{ inputs.ref && format('dist-{0}', inputs.ref) || 'dist' }}
4747
- uses: ./tools/github-actions/setup
48+
timeout-minutes: 30
4849
- name: Setup verdaccio once for all tests
4950
id: setup-verdaccio
5051
run: |
@@ -93,6 +94,7 @@ jobs:
9394
with:
9495
artifactName: ${{ inputs.ref && format('dist-{0}', inputs.ref) || 'dist' }}
9596
- uses: ./tools/github-actions/setup
97+
timeout-minutes: 30
9698
- shell: bash
9799
run: |
98100
git config --global user.name "GitHub Actions"

‎.github/workflows/main.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
# Fetch 2 is needed to properly check if the yarn.lock is affected by a pull-request
4040
fetch-depth: 2
4141
- uses: ./tools/github-actions/setup
42+
timeout-minutes: 30
4243
env:
4344
YARN_ENABLE_HARDENED_MODE: 1
4445
- name: Yarn errors reporter
@@ -52,11 +53,12 @@ jobs:
5253
needs: [yarn_lock_check]
5354
env:
5455
NX_SKIP_NX_CACHE: ${{ vars.NX_SKIP_NX_CACHE == 'true' || github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release') && !endsWith(github.ref, '-next') }}
55-
NX_SKIP_REMOTE_CACHE: ${{ vars.NX_SKIP_REMOTE_CACHE }}
56+
NX_SKIP_REMOTE_CACHE: ${{ vars.NX_SKIP_REMOTE_CACHE || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'skipRemoteCache')) }}
5657
NODE_COMPILE_CACHE: ~/.cache/node-compilation
5758
steps:
5859
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5960
- uses: ./tools/github-actions/setup
61+
timeout-minutes: 30
6062
- uses: ./.github/actions/setup-java
6163
with:
6264
install-jdk: 'true'
@@ -110,16 +112,16 @@ jobs:
110112
with:
111113
affected: ${{ github.event_name == 'pull_request' }}
112114
skipNxCache: ${{ vars.NX_SKIP_NX_CACHE == 'true' || github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release') && !endsWith(github.ref, '-next') }}
113-
skipNxRemoteCache: ${{ vars.NX_SKIP_REMOTE_CACHE == 'true' }}
115+
skipNxRemoteCache: ${{ vars.NX_SKIP_REMOTE_CACHE == 'true' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'skipRemoteCache')) }}
114116

115117
it-tests:
116118
uses: ./.github/workflows/it-tests.yml
117119
secrets:
118120
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
119121
needs: [yarn_lock_check, build]
120122
with:
121-
skipNxCache: ${{ vars.NX_SKIP_NX_CACHE == 'true' || github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release') && !endsWith(github.ref, '-next') }}
122-
skipNxRemoteCache: ${{ vars.NX_SKIP_REMOTE_CACHE == 'true' }}
123+
skipNxCache: ${{ vars.NX_SKIP_NX_CACHE == 'true' || github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release') && !endsWith(github.ref, '-next') }}
124+
skipNxRemoteCache: ${{ vars.NX_SKIP_REMOTE_CACHE == 'true' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'skipRemoteCache')) }}
123125

124126
e2e-tests:
125127
permissions:
@@ -130,7 +132,7 @@ jobs:
130132
needs: [yarn_lock_check, build]
131133
with:
132134
skipNxCache: ${{ vars.NX_SKIP_NX_CACHE == 'true' || github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release') && !endsWith(github.ref, '-next') }}
133-
skipNxRemoteCache: ${{ vars.NX_SKIP_REMOTE_CACHE == 'true'}}
135+
skipNxRemoteCache: ${{ vars.NX_SKIP_REMOTE_CACHE == 'true' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'skipRemoteCache')) }}
134136

135137
publish-packages:
136138
uses: ./.github/workflows/publish.yml
@@ -166,4 +168,4 @@ jobs:
166168
version: ${{ needs.version.outputs.nextVersionTag }}
167169
shouldDeploy: false
168170
skipNxCache: ${{ vars.NX_SKIP_NX_CACHE == 'true' }}
169-
skipNxRemoteCache: ${{ vars.NX_SKIP_REMOTE_CACHE == 'true' }}
171+
skipNxRemoteCache: ${{ vars.NX_SKIP_REMOTE_CACHE == 'true' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'skipRemoteCache')) }}

‎.github/workflows/pr-labels.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
fetch-depth: 0
2121
- name: Setup
2222
uses: ./tools/github-actions/setup
23+
timeout-minutes: 30
2324
- name: Determine labels
2425
run: |
2526
LABELS="$(yarn pr-labels --target="${{ github.base_ref || github.ref_name }}")"

0 commit comments

Comments
 (0)