Skip to content

Commit 438045b

Browse files
kevinhongzlkevinhongzl
authored
Merge branch 'main' into add-docs-for-custom-ui-alerts
2 parents 467148b + 7688825 commit 438045b

File tree

13 files changed

+1821
-1260
lines changed

13 files changed

+1821
-1260
lines changed

‎Dockerfile

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,24 @@ readonly MARIADB_LTS_VERSION="10.11"
232232
: "${INSTALL_MYSQL_CLIENT:?Should be true or false}"
233233
: "${INSTALL_MYSQL_CLIENT_TYPE:-mariadb}"
234234

235+
retry() {
236+
local retries=3
237+
local count=0
238+
# adding delay of 10 seconds
239+
local delay=10
240+
until "$@"; do
241+
exit_code=$?
242+
count=$((count + 1))
243+
if [[ $count -lt $retries ]]; then
244+
echo "Command failed. Attempt $count/$retries. Retrying in ${delay}s..."
245+
sleep $delay
246+
else
247+
echo "Command failed after $retries attempts."
248+
return $exit_code
249+
fi
250+
done
251+
}
252+
235253
install_mysql_client() {
236254
if [[ "${1}" == "dev" ]]; then
237255
packages=("libmysqlclient-dev" "mysql-client")
@@ -257,8 +275,8 @@ install_mysql_client() {
257275

258276
echo "deb http://repo.mysql.com/apt/debian/ $(lsb_release -cs) mysql-${MYSQL_LTS_VERSION}" > \
259277
/etc/apt/sources.list.d/mysql.list
260-
apt-get update
261-
apt-get install --no-install-recommends -y "${packages[@]}"
278+
retry apt-get update
279+
retry apt-get install --no-install-recommends -y "${packages[@]}"
262280
apt-get autoremove -yqq --purge
263281
apt-get clean && rm -rf /var/lib/apt/lists/*
264282

@@ -302,8 +320,8 @@ install_mariadb_client() {
302320
/etc/apt/sources.list.d/mariadb.list
303321
# Make sure that dependencies from MariaDB repo are preferred over Debian dependencies
304322
printf "Package: *\nPin: release o=MariaDB\nPin-Priority: 999\n" > /etc/apt/preferences.d/mariadb
305-
apt-get update
306-
apt-get install --no-install-recommends -y "${packages[@]}"
323+
retry apt-get update
324+
retry apt-get install --no-install-recommends -y "${packages[@]}"
307325
apt-get autoremove -yqq --purge
308326
apt-get clean && rm -rf /var/lib/apt/lists/*
309327
}

‎Dockerfile.ci

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,24 @@ readonly MARIADB_LTS_VERSION="10.11"
171171
: "${INSTALL_MYSQL_CLIENT:?Should be true or false}"
172172
: "${INSTALL_MYSQL_CLIENT_TYPE:-mariadb}"
173173

174+
retry() {
175+
local retries=3
176+
local count=0
177+
# adding delay of 10 seconds
178+
local delay=10
179+
until "$@"; do
180+
exit_code=$?
181+
count=$((count + 1))
182+
if [[ $count -lt $retries ]]; then
183+
echo "Command failed. Attempt $count/$retries. Retrying in ${delay}s..."
184+
sleep $delay
185+
else
186+
echo "Command failed after $retries attempts."
187+
return $exit_code
188+
fi
189+
done
190+
}
191+
174192
install_mysql_client() {
175193
if [[ "${1}" == "dev" ]]; then
176194
packages=("libmysqlclient-dev" "mysql-client")
@@ -196,8 +214,8 @@ install_mysql_client() {
196214

197215
echo "deb http://repo.mysql.com/apt/debian/ $(lsb_release -cs) mysql-${MYSQL_LTS_VERSION}" > \
198216
/etc/apt/sources.list.d/mysql.list
199-
apt-get update
200-
apt-get install --no-install-recommends -y "${packages[@]}"
217+
retry apt-get update
218+
retry apt-get install --no-install-recommends -y "${packages[@]}"
201219
apt-get autoremove -yqq --purge
202220
apt-get clean && rm -rf /var/lib/apt/lists/*
203221

@@ -241,8 +259,8 @@ install_mariadb_client() {
241259
/etc/apt/sources.list.d/mariadb.list
242260
# Make sure that dependencies from MariaDB repo are preferred over Debian dependencies
243261
printf "Package: *\nPin: release o=MariaDB\nPin-Priority: 999\n" > /etc/apt/preferences.d/mariadb
244-
apt-get update
245-
apt-get install --no-install-recommends -y "${packages[@]}"
262+
retry apt-get update
263+
retry apt-get install --no-install-recommends -y "${packages[@]}"
246264
apt-get autoremove -yqq --purge
247265
apt-get clean && rm -rf /var/lib/apt/lists/*
248266
}

‎airflow-core/src/airflow/ui/package.json

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
},
1818
"dependencies": {
1919
"@chakra-ui/anatomy": "^2.3.4",
20-
"@chakra-ui/react": "^3.15.1",
20+
"@chakra-ui/react": "^3.17.0",
2121
"@codemirror/lang-json": "^6.0.1",
2222
"@emotion/react": "^11.14.0",
23-
"@tanstack/react-query": "^5.69.0",
24-
"@tanstack/react-table": "^8.21.2",
23+
"@tanstack/react-query": "^5.75.1",
24+
"@tanstack/react-table": "^8.21.3",
2525
"@types/debounce-promise": "^3.1.9",
26-
"@uiw/codemirror-themes-all": "^4.23.10",
27-
"@uiw/react-codemirror": "^4.23.10",
26+
"@uiw/codemirror-themes-all": "^4.23.12",
27+
"@uiw/react-codemirror": "^4.23.12",
2828
"@visx/group": "^3.12.0",
2929
"@visx/shape": "^3.12.0",
3030
"@xyflow/react": "^12.4.4",
3131
"axios": "^1.8.4",
3232
"chakra-react-select": "6.1.0",
33-
"chart.js": "^4.4.8",
33+
"chart.js": "^4.4.9",
3434
"chartjs-plugin-annotation": "^3.1.0",
3535
"dayjs": "^1.11.13",
3636
"debounce-promise": "^3.1.2",
@@ -40,7 +40,7 @@
4040
"react": "^18.3.1",
4141
"react-chartjs-2": "^5.3.0",
4242
"react-dom": "^18.3.1",
43-
"react-hook-form": "^7.54.2",
43+
"react-hook-form": "^7.56.1",
4444
"react-hotkeys-hook": "^4.6.1",
4545
"react-icons": "^5.5.0",
4646
"react-innertext": "^1.1.5",
@@ -52,42 +52,49 @@
5252
"remark-gfm": "^4.0.1",
5353
"use-debounce": "^10.0.4",
5454
"usehooks-ts": "^3.1.1",
55-
"zustand": "^5.0.3"
55+
"zustand": "^5.0.4"
5656
},
5757
"devDependencies": {
5858
"@7nohe/openapi-react-query-codegen": "^1.6.2",
59-
"@eslint/compat": "^1.2.7",
60-
"@eslint/js": "^9.23.0",
59+
"@eslint/compat": "^1.2.9",
60+
"@eslint/js": "^9.25.1",
6161
"@stylistic/eslint-plugin": "^2.13.0",
62-
"@tanstack/eslint-plugin-query": "^5.68.0",
62+
"@tanstack/eslint-plugin-query": "^5.74.7",
6363
"@testing-library/jest-dom": "^6.6.3",
64-
"@testing-library/react": "^16.2.0",
64+
"@testing-library/react": "^16.3.0",
6565
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
66-
"@types/node": "^22.13.11",
66+
"@types/node": "^22.15.3",
6767
"@types/react": "^18.3.19",
6868
"@types/react-dom": "^18.3.5",
6969
"@types/react-syntax-highlighter": "^15.5.13",
70-
"@vitejs/plugin-react-swc": "^3.8.1",
70+
"@vitejs/plugin-react-swc": "^3.9.0",
7171
"@vitest/coverage-v8": "^2.1.9",
72-
"eslint": "^9.23.0",
73-
"eslint-config-prettier": "^10.1.1",
72+
"eslint": "^9.25.1",
73+
"eslint-config-prettier": "^10.1.2",
7474
"eslint-plugin-jsx-a11y": "^6.10.2",
75-
"eslint-plugin-perfectionist": "^4.10.1",
76-
"eslint-plugin-prettier": "^5.2.3",
77-
"eslint-plugin-react": "^7.37.4",
75+
"eslint-plugin-perfectionist": "^4.12.3",
76+
"eslint-plugin-prettier": "^5.2.6",
77+
"eslint-plugin-react": "^7.37.5",
7878
"eslint-plugin-react-hooks": "^4.6.2",
79-
"eslint-plugin-react-refresh": "^0.4.19",
79+
"eslint-plugin-react-refresh": "^0.4.20",
8080
"eslint-plugin-unicorn": "^55.0.0",
8181
"globals": "^15.15.0",
82-
"happy-dom": "^17.4.4",
83-
"msw": "^2.7.3",
82+
"happy-dom": "^17.4.6",
83+
"msw": "^2.7.5",
8484
"openapi-merge-cli": "^1.3.2",
8585
"prettier": "^3.5.3",
86-
"typescript": "~5.5.4",
87-
"typescript-eslint": "^8.27.0",
86+
"typescript": "~5.8.3",
87+
"typescript-eslint": "^8.31.1",
8888
"vite": "^5.4.19",
8989
"vite-plugin-css-injected-by-js": "^3.5.2",
9090
"vitest": "^2.1.9",
9191
"web-worker": "^1.5.0"
92+
},
93+
"pnpm": {
94+
"onlyBuiltDependencies": [
95+
"@swc/core",
96+
"esbuild",
97+
"msw"
98+
]
9299
}
93100
}

0 commit comments

Comments
 (0)