Skip to content

Commit 892cd0f

Browse files
1 parent 16fde1a commit 892cd0f

File tree

2 files changed

+40
-17
lines changed

2 files changed

+40
-17
lines changed

.bazelrc

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ build:engflow_common --experimental_inmemory_dotd_files
1010
build:engflow_common --experimental_inmemory_jdeps_files
1111
build:engflow_common --incompatible_strict_action_env=true
1212
build:engflow_common --remote_timeout=3600
13-
build:engflow_common --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
14-
build:engflow_common --java_runtime_version=remotejdk_11
15-
build:engflow_common --java_language_version=11
1613
build:engflow_common --grpc_keepalive_time=30s
1714
build:engflow_common --legacy_important_outputs=false
15+
build:engflow_common --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
1816

1917
# Options for continuous testing.
2018
build:ci --color=yes
@@ -25,6 +23,8 @@ build:ci --test_output=summary
2523
build:ci --show_progress_rate_limit=2.0
2624
build:ci --nobuild_runfile_links
2725
build:ci --keep_going
26+
build:ci --java_runtime_version=remotejdk_11
27+
build:ci --java_language_version=11
2828

2929
# Additional clang toolchain options for automatically configured toolchains.
3030
build --cxxopt="-std=c++14"

.github/workflows/main.yml

+37-14
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,6 @@ jobs:
3434
fail-fast: false
3535
matrix:
3636
include:
37-
- os: linux
38-
arch: x64
39-
os_distribution: debian
40-
os_version: 11
41-
revision: d04e89854b3931f4aaced77aa3a2fcad5834b3a6
42-
remote_execution: 'false'
43-
44-
- os: linux
45-
arch: x64
46-
os_distribution: debian
47-
os_version: 11
48-
revision: d04e89854b3931f4aaced77aa3a2fcad5834b3a6
49-
remote_execution: 'true'
50-
5137
- os: macos
5238
arch: x64
5339
os_distribution: monterey
@@ -79,3 +65,40 @@ jobs:
7965
OS: ${{ matrix.os }}
8066
REMOTE_EXECUTION: ${{ matrix.remote_execution }}
8167
run: python3 infra/test-all.py
68+
69+
ci-runners-test-matrix:
70+
runs-on:
71+
- self-hosted
72+
- "os=linux"
73+
- "arch=x64"
74+
- "remote_execution=${{ matrix.remote_execution }}"
75+
- "engflow-container-image=docker://645088952840.dkr.ecr.eu-west-1.amazonaws.com/engflow-ci/debian11-dind-x64@sha256:604855f1ecd6edad3f45f513ed0112b9e8e32589871133767a1a51944b07f487"
76+
- "engflow-pool=ci_sysbox_x64"
77+
- "engflow-runtime=sysbox-runc"
78+
- "engflow-runner-id=${{ github.repository_id }}_ci-runners-test-matrix_${{ github.run_id }}_${{ github.run_number }}_${{ github.run_attempt }}"
79+
timeout-minutes: 10
80+
strategy:
81+
fail-fast: false
82+
matrix:
83+
include:
84+
- remote_execution: 'false'
85+
86+
- remote_execution: 'true'
87+
88+
steps:
89+
- uses: actions/checkout@v3
90+
91+
- name: Set up authentication
92+
shell: bash
93+
run: cp infra/bazelrc .bazelrc.user
94+
95+
- name: Generate python requirements lock
96+
shell: bash
97+
run: bazel run //python:requirements.update
98+
99+
- name: Build and test
100+
env:
101+
ARCH: x64
102+
OS: linux
103+
REMOTE_EXECUTION: ${{ matrix.remote_execution }}
104+
run: python3 infra/test-all.py

0 commit comments

Comments
 (0)