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

staging alignment #4439

Merged
merged 22 commits into from
Jun 4, 2024
Merged

staging alignment #4439

merged 22 commits into from
Jun 4, 2024

Conversation

mzedel
Copy link
Contributor

@mzedel mzedel commented Jun 4, 2024

No description provided.

mzedel and others added 22 commits May 27, 2024 11:23
@mzedel
fix: fixed an issue that could prevent SSO logins depending on the ty…
420ce5a 
…pe of SSO

- slightly improved encapsulation of SSO method information

Ticket: None
Changelog: Title
Signed-off-by: Manuel Zedel <manuel.zedel@northern.tech>
@mzedel
fix: fixed SSO information not being adjusted depending on the type o…
ccaae1a 
…f SSO configured

Ticket: MEN-7277
Changelog: Title
Signed-off-by: Manuel Zedel <manuel.zedel@northern.tech>
@mzedel
feat: gave device deployment log files more descriptive file names
7ac48f1 
TIcket: MEN-7221
Changelog: Title
Signed-off-by: Manuel Zedel <manuel.zedel@northern.tech>
@mzedel
feat: made log viewer wider to ease going through deployment logs
a3349d6 
Ticket: MEN-7220
Changelog: Title
Signed-off-by: Manuel Zedel <manuel.zedel@northern.tech>
@mzedel
Merge pull request #4429 from mzedel/men-7221
f195874 
MEN-7221 - wider log viewer & friendlier log file names
@dependabot
chore: Bump the development-dependencies group with 12 updates
7b6e120 
Bumps the development-dependencies group with 12 updates:

| Package | From | To |
| --- | --- | --- |
| [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) | `7.24.5` | `7.24.6` |
| [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser) | `7.24.5` | `7.24.6` |
| [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) | `7.24.3` | `7.24.6` |
| [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) | `7.24.5` | `7.24.6` |
| [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) | `7.24.1` | `7.24.6` |
| [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `7.9.0` | `7.11.0` |
| [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `7.9.0` | `7.11.0` |
| [css-loader](https://github.com/webpack-contrib/css-loader) | `7.1.1` | `7.1.2` |
| [eslint](https://github.com/eslint/eslint) | `8.57.0` | `9.4.0` |
| [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) | `7.34.1` | `7.34.2` |
| [eslint-webpack-plugin](https://github.com/webpack-contrib/eslint-webpack-plugin) | `4.1.0` | `4.2.0` |
| [lint-staged](https://github.com/okonet/lint-staged) | `15.2.2` | `15.2.5` |


Updates `@babel/core` from 7.24.5 to 7.24.6
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.24.6/packages/babel-core)

Updates `@babel/eslint-parser` from 7.24.5 to 7.24.6
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.24.6/eslint/babel-eslint-parser)

Updates `@babel/plugin-transform-runtime` from 7.24.3 to 7.24.6
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.24.6/packages/babel-plugin-transform-runtime)

Updates `@babel/preset-env` from 7.24.5 to 7.24.6
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.24.6/packages/babel-preset-env)

Updates `@babel/preset-react` from 7.24.1 to 7.24.6
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.24.6/packages/babel-preset-react)

Updates `@typescript-eslint/eslint-plugin` from 7.9.0 to 7.11.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.11.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 7.9.0 to 7.11.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.11.0/packages/parser)

Updates `css-loader` from 7.1.1 to 7.1.2
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/css-loader@v7.1.1...v7.1.2)

Updates `eslint` from 8.57.0 to 9.4.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.57.0...v9.4.0)

Updates `eslint-plugin-react` from 7.34.1 to 7.34.2
- [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](jsx-eslint/eslint-plugin-react@v7.34.1...v7.34.2)

Updates `eslint-webpack-plugin` from 4.1.0 to 4.2.0
- [Release notes](https://github.com/webpack-contrib/eslint-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/eslint-webpack-plugin@v4.1.0...v4.2.0)

Updates `lint-staged` from 15.2.2 to 15.2.5
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Changelog](https://github.com/lint-staged/lint-staged/blob/master/CHANGELOG.md)
- [Commits](lint-staged/lint-staged@v15.2.2...v15.2.5)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: "@babel/eslint-parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: "@babel/plugin-transform-runtime"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: "@babel/preset-react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: development-dependencies
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: development-dependencies
- dependency-name: css-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: development-dependencies
- dependency-name: eslint-plugin-react
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: eslint-webpack-plugin
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: development-dependencies
- dependency-name: lint-staged
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
chore: Bump the production-dependencies group with 4 updates
f39ab9e 
Bumps the production-dependencies group with 4 updates: [@reduxjs/toolkit](https://github.com/reduxjs/redux-toolkit), [@stripe/stripe-js](https://github.com/stripe/stripe-js), [axios](https://github.com/axios/axios) and [react-hook-form](https://github.com/react-hook-form/react-hook-form).


Updates `@reduxjs/toolkit` from 2.2.4 to 2.2.5
- [Release notes](https://github.com/reduxjs/redux-toolkit/releases)
- [Commits](reduxjs/redux-toolkit@v2.2.4...v2.2.5)

Updates `@stripe/stripe-js` from 3.4.0 to 3.4.1
- [Release notes](https://github.com/stripe/stripe-js/releases)
- [Commits](stripe/stripe-js@v3.4.0...v3.4.1)

Updates `axios` from 1.6.8 to 1.7.2
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.6.8...v1.7.2)

Updates `react-hook-form` from 7.51.4 to 7.51.5
- [Release notes](https://github.com/react-hook-form/react-hook-form/releases)
- [Changelog](https://github.com/react-hook-form/react-hook-form/blob/master/CHANGELOG.md)
- [Commits](react-hook-form/react-hook-form@v7.51.4...v7.51.5)

---
updated-dependencies:
- dependency-name: "@reduxjs/toolkit"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: "@stripe/stripe-js"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: react-hook-form
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
chore: Bump node from 22.1.0-alpine to 22.2.0-alpine
d727e56 
Bumps node from 22.1.0-alpine to 22.2.0-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
chore: Bump nginx from 1.26.0-alpine to 1.27.0-alpine
ed9f12f 
Bumps nginx from 1.26.0-alpine to 1.27.0-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
chore: Bump the playwright group in /tests/e2e_tests with 3 updates
349b75d 
Bumps the playwright group in /tests/e2e_tests with 3 updates: [@playwright/test](https://github.com/microsoft/playwright), [playwright](https://github.com/microsoft/playwright) and [playwright-chromium](https://github.com/microsoft/playwright).


Updates `@playwright/test` from 1.44.0 to 1.44.1
- [Release notes](https://github.com/microsoft/playwright/releases)
- [Commits](microsoft/playwright@v1.44.0...v1.44.1)

Updates `playwright` from 1.44.0 to 1.44.1
- [Release notes](https://github.com/microsoft/playwright/releases)
- [Commits](microsoft/playwright@v1.44.0...v1.44.1)

Updates `playwright-chromium` from 1.44.0 to 1.44.1
- [Release notes](https://github.com/microsoft/playwright/releases)
- [Commits](microsoft/playwright@v1.44.0...v1.44.1)

---
updated-dependencies:
- dependency-name: "@playwright/test"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: playwright
- dependency-name: playwright
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: playwright
- dependency-name: playwright-chromium
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: playwright
...

Signed-off-by: dependabot[bot] <support@github.com>
@mzedel
Merge pull request #4433 from mendersoftware/dependabot/npm_and_yarn/…
5021939 
…production-dependencies-9428855f04

chore: Bump the production-dependencies group with 4 updates
@mzedel
Merge pull request #4435 from mendersoftware/dependabot/docker/node-2…
e7fac59 
…2.2.0-alpine

chore: Bump node from 22.1.0-alpine to 22.2.0-alpine
@mzedel
Merge pull request #4436 from mendersoftware/dependabot/docker/nginx-…
56997f7 
…1.27.0-alpine

chore: Bump nginx from 1.26.0-alpine to 1.27.0-alpine
@mzedel
Merge pull request #4437 from mendersoftware/dependabot/npm_and_yarn/…
b5b1df9 
…tests/e2e_tests/playwright-e68ee86190

chore: Bump the playwright group in /tests/e2e_tests with 3 updates
@dependabot
chore: Bump axios in /tests/e2e_tests in the e2e-test-dependencies group
83b1426 
Bumps the e2e-test-dependencies group in /tests/e2e_tests with 1 update: [axios](https://github.com/axios/axios).


Updates `axios` from 1.6.8 to 1.7.2
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.6.8...v1.7.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: e2e-test-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
chore: Bump the mui group with 3 updates
d906244 
Bumps the mui group with 3 updates: [@mui/icons-material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-icons-material), [@mui/material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-material) and [@mui/x-date-pickers](https://github.com/mui/mui-x/tree/HEAD/packages/x-date-pickers).


Updates `@mui/icons-material` from 5.15.17 to 5.15.19
- [Release notes](https://github.com/mui/material-ui/releases)
- [Changelog](https://github.com/mui/material-ui/blob/v5.15.19/CHANGELOG.md)
- [Commits](https://github.com/mui/material-ui/commits/v5.15.19/packages/mui-icons-material)

Updates `@mui/material` from 5.15.17 to 5.15.19
- [Release notes](https://github.com/mui/material-ui/releases)
- [Changelog](https://github.com/mui/material-ui/blob/v5.15.19/CHANGELOG.md)
- [Commits](https://github.com/mui/material-ui/commits/v5.15.19/packages/mui-material)

Updates `@mui/x-date-pickers` from 7.4.0 to 7.6.1
- [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.6.1/packages/x-date-pickers)

---
updated-dependencies:
- dependency-name: "@mui/icons-material"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: mui
- dependency-name: "@mui/material"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: mui
- dependency-name: "@mui/x-date-pickers"
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: mui
...

Signed-off-by: dependabot[bot] <support@github.com>
@mzedel
chore: aligned snapshots with updated mui version
75b2f21 
Signed-off-by: Manuel Zedel <manuel.zedel@northern.tech>
@mzedel
Merge pull request #4438 from mendersoftware/dependabot/npm_and_yarn/…
710888c 
…tests/e2e_tests/e2e-test-dependencies-38f7d6460c

chore: Bump axios from 1.6.8 to 1.7.2 in /tests/e2e_tests in the e2e-test-dependencies group
@mzedel
chore: reverted eslint to compatible version
683297e 
Signed-off-by: Manuel Zedel <manuel.zedel@northern.tech>
@mzedel
Merge pull request #4434 from mendersoftware/dependabot/npm_and_yarn/…
11c5607 
…mui-c7679d4b23

chore: Bump the mui group with 3 updates
@mzedel
Merge pull request #4432 from mendersoftware/dependabot/npm_and_yarn/…
7ea6d54 
…development-dependencies-5c0f0d156e

chore: Bump the development-dependencies group with 12 updates
@mzedel
Merge pull request #4423 from mzedel/men-7277
fb1ac19 
MEN-7277 - show SSO info depending on configured SSO type
@mzedel mzedel marked this pull request as ready for review June 4, 2024 07:02
@mzedel mzedel merged commit d07bb5c into staging Jun 4, 2024
1 of 2 checks passed
@mender-test-bot
Copy link
Contributor

mender-test-bot commented Jun 4, 2024 •
edited by jira bot
Loading

Merging these commits will result in the following changelog entries:

Changelogs

gui (master)

New changes in gui since staging:

Bug Fixes
  • fixed SSO information not being adjusted depending on the type of SSO configured
    (MEN-7277)
  • fixed an issue that could prevent SSO logins depending on the type of SSO
Features
  • gave device deployment log files more descriptive file names
    (MEN-7221)
  • made log viewer wider to ease going through deployment logs
    (MEN-7220)

@mender-test-bot
Copy link
Contributor

@mzedel, Let me know if you want to start the integration pipeline by mentioning me and the command "start pipeline".

my commands and options

You can trigger a pipeline on multiple prs with:

  • mentioning me and start pipeline --pr mender/127 --pr mender-connect/255

You can start a fast pipeline, disabling full integration tests with:

  • mentioning me and start pipeline --fast

You can trigger GitHub->GitLab branch sync with:

  • mentioning me and sync

You can cherry pick to a given branch or branches with:

  • mentioning me and:
 cherry-pick to:
 * 1.0.x
 * 2.0.x

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@mzedel @mender-test-bot