-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into dependabot/pip/typer-gte-0.12.0-and-neq-0.12…
….2-and-lt-0.16.0
- Loading branch information
Showing
573 changed files
with
31,752 additions
and
22,191 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,3 +15,7 @@ upstream dependency: | |
|
||
2.x: | ||
- base-branch: '2.x' | ||
|
||
ui-replatform: | ||
- changed-files: | ||
- any-glob-to-any-file: ui-v2/** |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
# This is a simple test to ensure we can make a websocket connection through a proxy server. It sets up a | ||
# simple server and a squid proxy server. The proxy server is inaccessible from the host machine, only the proxy | ||
# so we can confirm the proxy is actually working. | ||
|
||
name: Proxy Test | ||
on: | ||
pull_request: | ||
paths: | ||
- .github/workflows/proxy-test.yaml | ||
- scripts/proxy-test/* | ||
- "src/prefect/events/clients.py" | ||
- requirements.txt | ||
- requirements-client.txt | ||
- requirements-dev.txt | ||
push: | ||
branches: | ||
- main | ||
paths: | ||
- .github/workflows/proxy-test.yaml | ||
- scripts/proxy-test/* | ||
- "src/prefect/events/clients.py" | ||
- requirements.txt | ||
- requirements-client.txt | ||
- requirements-dev.txt | ||
|
||
jobs: | ||
proxy-test: | ||
name: Proxy Test | ||
timeout-minutes: 10 | ||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
persist-credentials: false | ||
fetch-depth: 0 | ||
|
||
- name: Set up Python 3.10 | ||
uses: actions/setup-python@v5 | ||
id: setup_python | ||
with: | ||
python-version: "3.10" | ||
|
||
- name: Create Docker networks | ||
run: | | ||
docker network create internal_net --internal | ||
docker network create external_net | ||
- name: Start API server container | ||
working-directory: scripts/proxy-test | ||
run: | | ||
docker build -t api-server . | ||
docker run -d --network internal_net --name server api-server | ||
- name: Start Squid Proxy container | ||
run: | | ||
docker run -d \ | ||
--network internal_net \ | ||
--network external_net \ | ||
-p 3128:3128 \ | ||
-v $(pwd)/scripts/proxy-test/squid.conf:/etc/squid/squid.conf \ | ||
--name proxy \ | ||
ubuntu/squid | ||
- name: Install Dependencies | ||
run: | | ||
python -m pip install -U uv | ||
uv pip install --upgrade --system . | ||
- name: Run Proxy Tests | ||
env: | ||
HTTP_PROXY: http://localhost:3128 | ||
HTTPS_PROXY: http://localhost:3128 | ||
run: python scripts/proxy-test/client.py |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,112 @@ | ||
name: Docker Build Time Benchmark | ||
|
||
on: | ||
push: | ||
branches: | ||
- main | ||
paths: | ||
- "Dockerfile" | ||
- ".dockerignore" | ||
pull_request: | ||
paths: | ||
- "Dockerfile" | ||
- ".dockerignore" | ||
|
||
jobs: | ||
benchmark: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
fetch-depth: 0 | ||
|
||
- name: Set up Docker Buildx | ||
uses: docker/setup-buildx-action@v3 | ||
|
||
# For PRs, checkout the base branch to compare against | ||
- name: Checkout base branch | ||
if: github.base_ref | ||
uses: actions/checkout@v4 | ||
with: | ||
ref: ${{ github.base_ref }} | ||
clean: true | ||
|
||
- name: Clean Docker system | ||
run: | | ||
docker system prune -af | ||
docker builder prune -af | ||
- name: Build base branch image | ||
if: github.base_ref | ||
id: base_build_time | ||
run: | | ||
start_time=$(date +%s) | ||
DOCKER_BUILDKIT=1 docker build . --no-cache --progress=plain | ||
end_time=$(date +%s) | ||
base_time=$((end_time - start_time)) | ||
echo "base_time=$base_time" >> $GITHUB_OUTPUT | ||
# For PRs, checkout back to the PR's HEAD | ||
- name: Checkout PR branch | ||
if: github.base_ref | ||
uses: actions/checkout@v4 | ||
with: | ||
ref: ${{ github.head_ref }} | ||
clean: true | ||
|
||
- name: Clean Docker system again | ||
run: | | ||
docker system prune -af | ||
docker builder prune -af | ||
- name: Build and time Docker image | ||
id: build_time | ||
run: | | ||
start_time=$(date +%s) | ||
DOCKER_BUILDKIT=1 docker build . --no-cache --progress=plain | ||
end_time=$(date +%s) | ||
build_time=$((end_time - start_time)) | ||
echo "build_time=$build_time" >> $GITHUB_OUTPUT | ||
- name: Compare build times | ||
run: | | ||
CURRENT_TIME=${{ steps.build_time.outputs.build_time }} | ||
if [ "${{ github.base_ref }}" != "" ]; then | ||
BASE_TIME=${{ steps.base_build_time.outputs.base_time }} | ||
echo "### 🏗️ Docker Build Time Comparison" >> $GITHUB_STEP_SUMMARY | ||
echo "" >> $GITHUB_STEP_SUMMARY | ||
echo "| Branch | Build Time | Difference |" >> $GITHUB_STEP_SUMMARY | ||
echo "|--------|------------|------------|" >> $GITHUB_STEP_SUMMARY | ||
echo "| base (${{ github.base_ref }}) | ${BASE_TIME}s | - |" >> $GITHUB_STEP_SUMMARY | ||
DIFF=$((CURRENT_TIME - BASE_TIME)) | ||
PERCENT=$(echo "scale=2; ($CURRENT_TIME - $BASE_TIME) * 100 / $BASE_TIME" | bc) | ||
if [ $DIFF -gt 0 ]; then | ||
DIFF_TEXT="⬆️ +${DIFF}s (+${PERCENT}%)" | ||
elif [ $DIFF -lt 0 ]; then | ||
DIFF_TEXT="⬇️ ${DIFF}s (${PERCENT}%)" | ||
else | ||
DIFF_TEXT="✨ No change" | ||
fi | ||
echo "| current (${{ github.head_ref }}) | ${CURRENT_TIME}s | $DIFF_TEXT |" >> $GITHUB_STEP_SUMMARY | ||
# Fail if build time increased by more than 5% | ||
if (( $(echo "$PERCENT > 5" | bc -l) )); then | ||
echo "" >> $GITHUB_STEP_SUMMARY | ||
echo "❌ **Build time increased by more than 5%!**" >> $GITHUB_STEP_SUMMARY | ||
echo "This change significantly increases the build time. Please review the Dockerfile changes." >> $GITHUB_STEP_SUMMARY | ||
exit 1 | ||
elif (( $(echo "$PERCENT < 0" | bc -l) )); then | ||
echo "" >> $GITHUB_STEP_SUMMARY | ||
echo "✅ **Build time decreased!**" >> $GITHUB_STEP_SUMMARY | ||
echo "Great job optimizing the build!" >> $GITHUB_STEP_SUMMARY | ||
fi | ||
else | ||
echo "### 🏗️ Docker Build Time" >> $GITHUB_STEP_SUMMARY | ||
echo "" >> $GITHUB_STEP_SUMMARY | ||
echo "Build completed in ${CURRENT_TIME} seconds" >> $GITHUB_STEP_SUMMARY | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
v18.18.0 | ||
18.18.0 |
Oops, something went wrong.