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

Combined PRs #996

Merged
merged 7 commits into from
Oct 21, 2024
Merged

Combined PRs #996

merged 7 commits into from
Oct 21, 2024

Conversation

the-hideout-combine-prs[bot]
Copy link
Contributor

Combined PRs ➡️📦⬅️

✅ The following pull requests have been successfully combined on this PR:

This PR was created by the github/combine-prs action

dependabot bot and others added 6 commits September 27, 2024 17:19
Bumps [rollup](https://github.com/rollup/rollup) from 2.79.1 to 2.79.2.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](rollup/rollup@v2.79.1...v2.79.2)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps the github-actions group with 3 updates: [github/branch-deploy](https://github.com/github/branch-deploy), [actions/setup-node](https://github.com/actions/setup-node) and [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/branch-deploy` from 9.7.0 to 9.8.1
- [Release notes](https://github.com/github/branch-deploy/releases)
- [Commits](github/branch-deploy@v9.7.0...v9.8.1)

Updates `actions/setup-node` from 4.0.3 to 4.0.4
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v4.0.3...v4.0.4)

Updates `github/codeql-action` from 3.26.6 to 3.26.10
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@4dd1613...e2b3eaf)

---
updated-dependencies:
- dependency-name: github/branch-deploy
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps the npm-dependencies group with 9 updates:

| Package | From | To |
| --- | --- | --- |
| [@mui/lab](https://github.com/mui/material-ui/tree/HEAD/packages/mui-lab) | `6.0.0-beta.9` | `6.0.0-beta.10` |
| [@mui/material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-material) | `6.0.2` | `6.1.1` |
| [@mui/x-tree-view](https://github.com/mui/mui-x/tree/HEAD/packages/x-tree-view) | `7.16.0` | `7.18.0` |
| [framer-motion](https://github.com/framer/motion) | `11.5.4` | `11.9.0` |
| [i18next](https://github.com/i18next/i18next) | `23.14.0` | `23.15.1` |
| [rc-slider](https://github.com/react-component/slider) | `11.1.5` | `11.1.6` |
| [react-i18next](https://github.com/i18next/react-i18next) | `15.0.1` | `15.0.2` |
| [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) | `6.26.1` | `6.26.2` |
| [react-select](https://github.com/JedWatson/react-select) | `5.8.0` | `5.8.1` |


Updates `@mui/lab` from 6.0.0-beta.9 to 6.0.0-beta.10
- [Release notes](https://github.com/mui/material-ui/releases)
- [Changelog](https://github.com/mui/material-ui/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mui/material-ui/commits/HEAD/packages/mui-lab)

Updates `@mui/material` from 6.0.2 to 6.1.1
- [Release notes](https://github.com/mui/material-ui/releases)
- [Changelog](https://github.com/mui/material-ui/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mui/material-ui/commits/v6.1.1/packages/mui-material)

Updates `@mui/x-tree-view` from 7.16.0 to 7.18.0
- [Release notes](https://github.com/mui/mui-x/releases)
- [Changelog](https://github.com/mui/mui-x/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mui/mui-x/commits/v7.18.0/packages/x-tree-view)

Updates `framer-motion` from 11.5.4 to 11.9.0
- [Changelog](https://github.com/framer/motion/blob/main/CHANGELOG.md)
- [Commits](motiondivision/motion@v11.5.4...v11.9.0)

Updates `i18next` from 23.14.0 to 23.15.1
- [Release notes](https://github.com/i18next/i18next/releases)
- [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md)
- [Commits](i18next/i18next@v23.14.0...v23.15.1)

Updates `rc-slider` from 11.1.5 to 11.1.6
- [Release notes](https://github.com/react-component/slider/releases)
- [Changelog](https://github.com/react-component/slider/blob/master/CHANGELOG.md)
- [Commits](react-component/slider@v11.1.5...v11.1.6)

Updates `react-i18next` from 15.0.1 to 15.0.2
- [Changelog](https://github.com/i18next/react-i18next/blob/master/CHANGELOG.md)
- [Commits](i18next/react-i18next@v15.0.1...v15.0.2)

Updates `react-router-dom` from 6.26.1 to 6.26.2
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/[email protected]/packages/react-router-dom)

Updates `react-select` from 5.8.0 to 5.8.1
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/JedWatson/react-select/compare/[email protected]@5.8.1)

---
updated-dependencies:
- dependency-name: "@mui/lab"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: npm-dependencies
- dependency-name: "@mui/material"
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: npm-dependencies
- dependency-name: "@mui/x-tree-view"
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: npm-dependencies
- dependency-name: framer-motion
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: npm-dependencies
- dependency-name: i18next
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: npm-dependencies
- dependency-name: rc-slider
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: npm-dependencies
- dependency-name: react-i18next
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: npm-dependencies
- dependency-name: react-router-dom
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: npm-dependencies
- dependency-name: react-select
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: npm-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
@the-hideout-combine-prs the-hideout-combine-prs bot requested a review from a team as a code owner October 2, 2024 01:32
Copy link
Contributor

github-actions bot commented Oct 2, 2024

👋 Thanks for opening a pull request!

If you are new, please check out the trimmed down summary of our deployment process below:

  1. 👀 Observe the CI jobs and tests to ensure they are passing

  2. ✔️ Obtain an approval/review on this pull request

  3. 🚀 Deploy your pull request to the development environment with .deploy to development

  4. 🚀 Deploy your pull request to the production environment with .deploy

    If anything goes wrong, rollback with .deploy main

  5. 🎉 Merge!

Note: If you have a larger change and want to block deployments, you can run .lock --reason <reason> to lock all other deployments (remove with .unlock)

You can view the branch deploy usage guide for additional information

@Shebuka
Copy link
Contributor

Shebuka commented Oct 18, 2024

.deploy

Copy link
Contributor

Deployment Triggered 🚀

Shebuka, started a branch deployment to production

You can watch the progress here 🔗

Branch: combined-prs-branch

Copy link
Contributor

Deployment Results ✅

Shebuka successfully deployed branch combined-prs-branch to production

Environment URL: tarkov.dev

@Razzmatazzz Razzmatazzz merged commit 347711c into main Oct 21, 2024
2 checks passed
@Razzmatazzz Razzmatazzz deleted the combined-prs-branch branch October 21, 2024 02:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants