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

Upgrade flux to 2.4.0 #4232

Merged
merged 2 commits into from
Dec 3, 2024
Merged

Upgrade flux to 2.4.0 #4232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a3d366
[create-pull-request] automated change
Nov 15, 2024
d6ce372
Fixes for audit failures
casibbald Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ BUILD_TIME?=$(shell date +'%Y-%m-%d_%T')
BRANCH?=$(shell which git > /dev/null && git rev-parse --abbrev-ref HEAD)
GIT_COMMIT?=$(shell which git > /dev/null && git log -n1 --pretty='%h')
VERSION?=$(shell which git > /dev/null && git describe --always --match "v*")
FLUX_VERSION=2.3.0
FLUX_VERSION=2.4.0
CHART_VERSION=$(shell which yq > /dev/null && yq e '.version' charts/gitops-server/Chart.yaml)
TIER=oss

Expand Down
12 changes: 10 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.58",
"cross-spawn": "^7.0.5",
"d3": "^7.6.1",
"d3-dag": "^0.11.5",
"history": "^5.0.0",
Expand All @@ -73,7 +74,8 @@
"react-toastify": "^9.1.2",
"remark-gfm": "^3.0.1",
"styled-components": "^5.3.0",
"yaml": "^2.2.2"
"yaml": "^2.2.2",
"commander": "^11.0.0"
},
"jest": {
"preset": "ts-jest",
Expand All @@ -87,6 +89,9 @@
"testEnvironment": "jsdom"
},
"devDependencies": {
"@babel/core": "^7.26.0",
"@babel/preset-env": "^7.26.0",
"@babel/preset-react": "^7.25.9",
"@parcel/config-default": "^2.8.3",
"@parcel/optimizer-data-url": "^2.8.3",
"@parcel/transformer-inline-string": "^2.8.3",
Expand Down Expand Up @@ -121,6 +126,9 @@
"yaml": "yaml/browser/dist/index.js"
},
"resolutions": {
"htmlnano": "2.0.3"
"htmlnano": "2.0.3",
"eslint": "8.50.0",
"jest": "^29.0.0",
"cross-spawn": "^7.0.5"
}
}
Loading
Loading