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

Update pull_request_approved.yml #1

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Update pull_request_approved.yml #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0df3d0b
Update pull_request_approved.yml
cmengting Feb 19, 2024
e544aa7
Update cancel.yml
cmengting Feb 19, 2024
91c24b6
Update pull_request.yml
xjia1 Feb 20, 2024
fa502c3
Update pull_request.yml
cmengting Feb 23, 2024
cb471fe
Update pull_request.yml
cmengting Feb 27, 2024
21057d2
Update pull_request.yml #no_ci_cache
cmengting Feb 28, 2024
dfe1361
Update reusable_docker.yml #no_ci_cache
cmengting Feb 28, 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 .github/workflows/cancel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on: # yamllint disable-line rule:truthy
- requested
jobs:
cancel:
runs-on: [self-hosted, style-checker]
runs-on: dimerun-h9-ubuntu2204
steps:
- uses: styfle/[email protected]
with:
Expand Down
19 changes: 14 additions & 5 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ on: # yamllint disable-line rule:truthy
##########################################################################################
jobs:
RunConfig:
runs-on: [self-hosted, style-checker-aarch64]
runs-on: dimerun-h9-ubuntu2204
environment: ci-test
outputs:
data: ${{ steps.runconfig.outputs.CI_DATA }}
steps:
Expand All @@ -30,10 +31,16 @@ jobs:
clear-repository: true # to ensure correct digests
fetch-depth: 0 # to get version
filter: tree:0
- name: Labels check
- name: Install dependencies
run: |
cd "$GITHUB_WORKSPACE/tests/ci"
python3 run_check.py
pip3 install PyGithub boto3 unidiff
# - name: Labels check
# env:
# AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
# AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
# run: |
# cd "$GITHUB_WORKSPACE/tests/ci"
# python3 run_check.py
- name: Python unit tests
run: |
cd "$GITHUB_WORKSPACE/tests/ci"
Expand All @@ -46,7 +53,7 @@ jobs:
- name: PrepareRunConfig
id: runconfig
run: |
python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --configure --outfile ${{ runner.temp }}/ci_run_data.json
python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --configure --outfile ${{ runner.temp }}/ci_run_data.json --skip-docker

echo "::group::CI configuration"
python3 -m json.tool ${{ runner.temp }}/ci_run_data.json
Expand All @@ -57,6 +64,8 @@ jobs:
cat ${{ runner.temp }}/ci_run_data.json
echo 'EOF'
} >> "$GITHUB_OUTPUT"

cat ${{ runner.temp }}/ci_run_data.json
- name: Re-create GH statuses for skipped jobs if any
run: |
python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ runner.temp }}/ci_run_data.json --update-gh-statuses
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request_approved.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on: # yamllint disable-line rule:truthy

jobs:
MergeOnApproval:
runs-on: [self-hosted, style-checker]
runs-on: dimerun-h9-ubuntu2204
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
Expand Down
17 changes: 14 additions & 3 deletions .github/workflows/reusable_docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,30 @@ name: Build docker images
default: false
jobs:
DockerBuildAarch64:
runs-on: [self-hosted, style-checker-aarch64]
runs-on: dimerun-h9-ubuntu2204
environment: ci-test
if: |
!failure() && !cancelled() && toJson(fromJson(inputs.data).docker_data.missing_aarch64) != '[]'
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
with:
ref: ${{ fromJson(inputs.data).git_ref }}
- name: Install dependencies
run: |
pip3 install PyGithub boto3 unidiff
- name: Build images
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
run: |
python3 "${GITHUB_WORKSPACE}/tests/ci/docker_images_check.py" \
--suffix aarch64 \
--image-tags '${{ toJson(fromJson(inputs.data).docker_data.images) }}' \
--missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_aarch64) }}'
DockerBuildAmd64:
runs-on: [self-hosted, style-checker]
runs-on: dimerun-h9-ubuntu2204
environment: ci-test
if: |
!failure() && !cancelled() && toJson(fromJson(inputs.data).docker_data.missing_amd64) != '[]'
steps:
Expand All @@ -37,14 +45,17 @@ jobs:
with:
ref: ${{ fromJson(inputs.data).git_ref }}
- name: Build images
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
run: |
python3 "${GITHUB_WORKSPACE}/tests/ci/docker_images_check.py" \
--suffix amd64 \
--image-tags '${{ toJson(fromJson(inputs.data).docker_data.images) }}' \
--missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_amd64) }}'
DockerMultiArchManifest:
needs: [DockerBuildAmd64, DockerBuildAarch64]
runs-on: [self-hosted, style-checker]
runs-on: dimerun-h9-ubuntu2204
if: |
!failure() && !cancelled() && (toJson(fromJson(inputs.data).docker_data.missing_multi) != '[]' || inputs.set_latest)
steps:
Expand Down
Loading