[cascading] from release/11.5 to release/11.6 #2815
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![otter-cascading[bot]](https://avatars.githubusercontent.com/in/318094?s=60&v=4){kind=small}
Italy changed their light saving date time logic several time in the past. As a result, the offset computation for lightsaving switch prior to 1980 are incorrect. This result in invalid utils.Date which are serialized to the day before. Setting utils.Date time to 12:00 avoids this error (12:00 being correctly computed as after the time change). It also reduces the impact of an incorrect offset.
## Context Italy changed their daylight saving logic several time in the past (may prior 1980, march following then). As a result, the offset computation for lightsaving switch prior to 1980 are incorrect:  Here, the timezone offset should be -60 prior to the timechange (2am). A valid offset would be the following (working example with France daylight saving switch in 1992):  This results in invalid utils.Date which are serialized to the day before. ## Proposed change Setting utils.Date time to 12:00 avoids this error (12:00 being correctly computed as after the time change). It also reduces the impact of an incorrect offset. ## Related issues <!-- Please make sure to follow the [contribution guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md) --> *- No issue associated -* <!-- * 🐛 Fix #issue --> <!-- * 🐛 Fix resolves #issue --> <!-- * 🚀 Feature #issue --> <!-- * 🚀 Feature resolves #issue --> <!-- *Pull Request #issue -->
…into HEAD # Conflicts: # .github/workflows/publish.yml # .github/workflows/scorecards.yml # apps/showcase/package.json # package.json # packages/@o3r/testing/package.json # yarn.lock
<!--
{"currentBranch":"release/10.4","targetBranch":"release/11.0","bypassReviewers":false,"isConflicting":false}
-->
## Cascading from release/10.4 to release/11.0
---
:heavy_exclamation_mark: The pull request is conflicting with the target
branch.
You can fix the issue locally with the following commands:
<details open>
<summary>Using <b>gh CLI</b></summary>
```shell
gh pr checkout 2796
git pull --ff origin release/11.0
```
and update this Pull Request with
```shell
gh pr push 2796
```
</details>
<details>
<summary>Using <b>git</b> only</summary>
```shell
git fetch origin
git checkout origin/cascading/10.4.0-11.0.0
git pull --ff origin release/11.0
```
and update this Pull Request with
```shell
git push origin HEAD:cascading/10.4.0-11.0.0
```
</details>
---
<small>This Pull Request has been generated with :heart: by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
…into HEAD # Conflicts: # .github/workflows/documentation.yml # .github/workflows/it-tests.yml # .github/workflows/publish.yml # .github/workflows/scorecards.yml # apps/showcase/package.json # packages/@o3r/testing/package.json # yarn.lock
<!--
{"currentBranch":"release/11.0","targetBranch":"release/11.1","bypassReviewers":false,"isConflicting":false}
-->
## Cascading from release/11.0 to release/11.1
---
:heavy_exclamation_mark: The pull request is conflicting with the target
branch.
You can fix the issue locally with the following commands:
<details open>
<summary>Using <b>gh CLI</b></summary>
```shell
gh pr checkout 2800
git pull --ff origin release/11.1
```
and update this Pull Request with
```shell
gh pr push 2800
```
</details>
<details>
<summary>Using <b>git</b> only</summary>
```shell
git fetch origin
git checkout origin/cascading/11.0.0-11.1.0
git pull --ff origin release/11.1
```
and update this Pull Request with
```shell
git push origin HEAD:cascading/11.0.0-11.1.0
```
</details>
---
<small>This Pull Request has been generated with :heart: by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
…into HEAD # Conflicts: # .github/workflows/documentation.yml # .github/workflows/it-tests.yml # .github/workflows/publish.yml # .github/workflows/scorecards.yml # apps/showcase/package.json # package.json # packages/@o3r/testing/package.json # yarn.lock
<!--
{"currentBranch":"release/11.1","targetBranch":"release/11.2","bypassReviewers":false,"isConflicting":false}
-->
## Cascading from release/11.1 to release/11.2
---
:heavy_exclamation_mark: The pull request is conflicting with the target
branch.
You can fix the issue locally with the following commands:
<details open>
<summary>Using <b>gh CLI</b></summary>
```shell
gh pr checkout 2802
git pull --ff origin release/11.2
```
and update this Pull Request with
```shell
gh pr push 2802
```
</details>
<details>
<summary>Using <b>git</b> only</summary>
```shell
git fetch origin
git checkout origin/cascading/11.1.0-11.2.0
git pull --ff origin release/11.2
```
and update this Pull Request with
```shell
git push origin HEAD:cascading/11.1.0-11.2.0
```
</details>
---
<small>This Pull Request has been generated with :heart: by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
…into HEAD # Conflicts: # .github/workflows/code-check.yml # .github/workflows/documentation.yml # .github/workflows/e2e-tests.yml # .github/workflows/it-tests.yml # .github/workflows/publish.yml # .github/workflows/scorecards.yml # apps/showcase/package.json # package.json # packages/@o3r/testing/package.json # yarn.lock
<!--
{"currentBranch":"release/11.2","targetBranch":"release/11.3","bypassReviewers":false,"isConflicting":false}
-->
## Cascading from release/11.2 to release/11.3
---
:heavy_exclamation_mark: The pull request is conflicting with the target
branch.
You can fix the issue locally with the following commands:
<details open>
<summary>Using <b>gh CLI</b></summary>
```shell
gh pr checkout 2811
git pull --ff origin release/11.3
```
and update this Pull Request with
```shell
gh pr push 2811
```
</details>
<details>
<summary>Using <b>git</b> only</summary>
```shell
git fetch origin
git checkout origin/cascading/11.2.0-11.3.0
git pull --ff origin release/11.3
```
and update this Pull Request with
```shell
git push origin HEAD:cascading/11.2.0-11.3.0
```
</details>
---
<small>This Pull Request has been generated with :heart: by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
…into HEAD # Conflicts: # .github/workflows/code-check.yml # .github/workflows/documentation.yml # .github/workflows/e2e-tests.yml # .github/workflows/it-tests.yml # .github/workflows/publish.yml # .github/workflows/scorecards.yml # apps/showcase/package.json # package.json # packages/@o3r/testing/package.json # yarn.lock
<!--
{"currentBranch":"release/11.3","targetBranch":"release/11.4","bypassReviewers":false,"isConflicting":false}
-->
## Cascading from release/11.3 to release/11.4
---
:heavy_exclamation_mark: The pull request is conflicting with the target
branch.
You can fix the issue locally with the following commands:
<details open>
<summary>Using <b>gh CLI</b></summary>
```shell
gh pr checkout 2812
git pull --ff origin release/11.4
```
and update this Pull Request with
```shell
gh pr push 2812
```
</details>
<details>
<summary>Using <b>git</b> only</summary>
```shell
git fetch origin
git checkout origin/cascading/11.3.0-11.4.0
git pull --ff origin release/11.4
```
and update this Pull Request with
```shell
git push origin HEAD:cascading/11.3.0-11.4.0
```
</details>
---
<small>This Pull Request has been generated with :heart: by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
…into HEAD # Conflicts: # yarn.lock
<!--
{"currentBranch":"release/11.4","targetBranch":"release/11.5","bypassReviewers":false,"isConflicting":false}
-->
## Cascading from release/11.4 to release/11.5
---
:heavy_exclamation_mark: The pull request is conflicting with the target
branch.
You can fix the issue locally with the following commands:
<details open>
<summary>Using <b>gh CLI</b></summary>
```shell
gh pr checkout 2813
git pull --ff origin release/11.5
```
and update this Pull Request with
```shell
gh pr push 2813
```
</details>
<details>
<summary>Using <b>git</b> only</summary>
```shell
git fetch origin
git checkout origin/cascading/11.4.0-11.5.0
git pull --ff origin release/11.5
```
and update this Pull Request with
```shell
git push origin HEAD:cascading/11.4.0-11.5.0
```
</details>
---
<small>This Pull Request has been generated with :heart: by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
Codecov ReportAll modified and coverable lines are covered by tests ✅
✅ All tests successful. No failed tests found. Additional details and impacted files☔ View full report in Codecov by Sentry. |
…into HEAD # Conflicts: # apps/showcase/package.json # package.json # packages/@ama-sdk/core/src/fwk/date.ts # packages/@o3r/testing/package.json # yarn.lock
fpaul-1A
approved these changes
Feb 7, 2025
|
View your CI Pipeline Execution ↗ for commit 58ac6d9.
☁️ Nx Cloud last updated this comment at |
cpaulve-1A
approved these changes
Feb 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cascading from release/11.5 to release/11.6
❗ The pull request is conflicting with the target branch.
You can fix the issue locally with the following commands:
Using gh CLI
and update this Pull Request with
Using git only
and update this Pull Request with
This Pull Request has been generated with ❤️ by the Otter cascading tool.