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.

Sign up for GitHub

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

Jump to bottom

Combined PRs #732

Merged
merged 11 commits into from
Nov 9, 2023
Merged

Combined PRs #732

merged 11 commits into from
Nov 9, 2023

Conversation

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

@the-hideout-combine-prs the-hideout-combine-prs bot commented Oct 30, 2023 •
edited
Loading

Combined PRs ➡️📦⬅️

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

⚠️ The following PRs were left out due to merge conflicts:

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

dependabot bot and others added 4 commits October 30, 2023 02:30
@dependabot
Bump github/branch-deploy from 8.1.0 to 8.1.1
29e0560 
Bumps [github/branch-deploy](https://github.com/github/branch-deploy) from 8.1.0 to 8.1.1.
- [Release notes](https://github.com/github/branch-deploy/releases)
- [Commits](github/branch-deploy@v8.1.0...v8.1.1)

---
updated-dependencies:
- dependency-name: github/branch-deploy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump @mui/material from 5.14.14 to 5.14.15
fa1994c 
Bumps [@mui/material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-material) from 5.14.14 to 5.14.15.
- [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/v5.14.15/packages/mui-material)

---
updated-dependencies:
- dependency-name: "@mui/material"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@the-hideout-combine-prs
Merge dependabot/github_actions/github/branch-deploy-8.1.1 into combi…
efcf64e 
…ned-prs-branch
@the-hideout-combine-prs
Merge dependabot/npm_and_yarn/mui/material-5.14.15 into combined-prs-…
78b50cc 
…branch
@the-hideout-combine-prs the-hideout-combine-prs bot requested a review from a team as a code owner October 30, 2023 16:56
@github-actions
Copy link
Contributor

👋 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 30, 2023

.deploy

@github-actions
Copy link
Contributor

Deployment Triggered 🚀

Shebuka, started a branch deployment to production

You can watch the progress here 🔗

Branch: combined-prs-branch

@github-actions
Copy link
Contributor

Deployment Results ❌

Shebuka had a failure when deploying branch combined-prs-branch to production

@github-actions github-actions bot mentioned this pull request Nov 4, 2023
Merged
dependabot bot and others added 6 commits November 6, 2023 00:04
@dependabot
Bump victory from 36.6.11 to 36.6.12
23cf4c4 
Bumps [victory](https://github.com/FormidableLabs/victory) from 36.6.11 to 36.6.12.
- [Release notes](https://github.com/FormidableLabs/victory/releases)
- [Changelog](https://github.com/FormidableLabs/victory/blob/main/CHANGELOG.md)
- [Commits](FormidableLabs/victory@v36.6.11...v36.6.12)

---
updated-dependencies:
- dependency-name: victory
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump i18next-http-backend from 2.2.2 to 2.3.1
de08bc8 
Bumps [i18next-http-backend](https://github.com/i18next/i18next-http-backend) from 2.2.2 to 2.3.1.
- [Changelog](https://github.com/i18next/i18next-http-backend/blob/master/CHANGELOG.md)
- [Commits](i18next/i18next-http-backend@v2.2.2...v2.3.1)

---
updated-dependencies:
- dependency-name: i18next-http-backend
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump i18next from 23.5.1 to 23.6.0
cd638d9 
Bumps [i18next](https://github.com/i18next/i18next) from 23.5.1 to 23.6.0.
- [Release notes](https://github.com/i18next/i18next/releases)
- [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md)
- [Commits](i18next/i18next@v23.5.1...v23.6.0)

---
updated-dependencies:
- dependency-name: i18next
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@the-hideout-combine-prs
Merge dependabot/npm_and_yarn/i18next-23.6.0 into combined-prs-branch
49e5262
@the-hideout-combine-prs
Merge dependabot/npm_and_yarn/i18next-http-backend-2.3.1 into combine…
2105f4f 
…d-prs-branch
@the-hideout-combine-prs
Merge dependabot/npm_and_yarn/victory-36.6.12 into combined-prs-branch
2e5169e
@Shebuka
Copy link
Contributor

Shebuka commented Nov 8, 2023

.deploy

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 8, 2023

⚠️ Cannot claim deployment lock

Sorry Shebuka, the production environment deployment lock is currently claimed by Razzmatazzz

Lock Details 🔒

  • Environment: production
  • Branch: svg-tile-selection
  • Created At: 2023-11-07T13:32:13.466Z
  • Created By: Razzmatazzz
  • Sticky: true
  • Global: false
  • Comment Link: click here
  • Lock Link: click here

The current lock has been active for 0d:18h:18m:36s

If you need to release the lock, please comment .unlock production

@Razzmatazzz
Copy link
Member

.deploy

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 9, 2023

Deployment Triggered 🚀

Razzmatazzz, started a branch deployment to production

You can watch the progress here 🔗

Branch: combined-prs-branch

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 9, 2023

Deployment Results ✅

Razzmatazzz successfully deployed branch combined-prs-branch to production

Environment URL: tarkov.dev

@Razzmatazzz Razzmatazzz merged commit 9fd3399 into main Nov 9, 2023
2 checks passed
@Razzmatazzz Razzmatazzz deleted the combined-prs-branch branch November 9, 2023 20:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Shebuka Shebuka Shebuka approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Shebuka @Razzmatazzz