Skip to content

Commit

Permalink
[cascading] from release/11.5.0-rc to main (#2549)
Browse files Browse the repository at this point in the history
<!--
{"currentBranch":"release/11.5.0-rc","targetBranch":"main","bypassReviewers":false,"isConflicting":false}
-->

## Cascading from release/11.5.0-rc to main

---

: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 2549
  git pull --ff origin main
  ```

  and update this Pull Request with

  ```shell
  gh pr push 2549
  ```
</details>

<details>
  <summary>Using <b>git</b> only</summary>

  ```shell
  git fetch origin
  git checkout origin/cascading/11.5.0-rc-main
  git pull --ff origin main
  ```

  and update this Pull Request with

  ```shell
  git push origin HEAD:cascading/11.5.0-rc-main
  ```
</details>

---

<small>This Pull Request has been generated with :heart: by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
  • Loading branch information
mrednic-1A authored Dec 4, 2024
2 parents 9df67aa + f59158a commit 399494f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
5 changes: 1 addition & 4 deletions packages/@o3r-training/showcase-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
"types": "index.d.ts",
"sideEffects": false,
"deprecated": "This package is intended for testing purposes only.",
"publishConfig": {
"access": "public"
},
"private": true,
"exports": {
"./package.json": {
"default": "./package.json"
Expand Down Expand Up @@ -48,7 +46,6 @@
"spec:regen": "yarn run generate --no-dry-run && amasdk-clear-index",
"files:pack": "yarn amasdk-files-pack",
"test": "jest --passWithNoTests",
"publish:package": "npm publish ./dist",
"generate:mock": "schematics ../../@ama-sdk/schematics:mock",
"doc:generate": "node scripts/override-readme.js && typedoc && node scripts/restore-readme.js",
"tools:changelog": "commit-and-tag-version"
Expand Down
8 changes: 1 addition & 7 deletions packages/@o3r-training/showcase-sdk/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,7 @@
},
"lint": {
"executor": "nx:run-commands"
},
"publish": {
"executor": "nx:run-commands",
"options": {
"command": "npm publish packages/@o3r-training/showcase-sdk/dist"
}
}
},
"tags": ["showcase"]
"tags": ["private", "showcase"]
}

0 comments on commit 399494f

Please sign in to comment.