Skip to content

Commit fafc229

Browse files
tammy-baylis-switammy-baylis-swi
authored
Merge branch 'main' into redis-semconv-opt-in
2 parents 1a033fb + 7384e45 commit fafc229

26 files changed

Lines changed: 15073 additions & 15046 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Do not edit this file.
2+
# This file is generated automatically by executing tox -e generate-workflows
3+
4+
name: CI
5+
6+
on:
7+
push:
8+
branches:
9+
- 'main'
10+
pull_request:
11+
12+
permissions:
13+
contents: read
14+
15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
17+
cancel-in-progress: true
18+
19+
jobs:
20+
misc:
21+
uses: ./.github/workflows/misc.yml
22+
lint:
23+
uses: ./.github/workflows/lint.yml
24+
tests:
25+
uses: ./.github/workflows/test.yml
26+
27+
check:
28+
if: always()
29+
needs:
30+
- misc
31+
- lint
32+
- tests
33+
runs-on: ubuntu-latest
34+
steps:
35+
- name: Decide whether the needed jobs succeeded or failed
36+
uses: re-actors/alls-green@release/v1
37+
with:
38+
jobs: ${{ toJSON(needs) }}

.github/workflows/core_contrib_test_0.yml renamed to .github/workflows/core_contrib_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Do not edit this file.
22
# This file is generated automatically by executing tox -e generate-workflows
33

4-
name: Core Contrib Test 0
4+
name: Core Contrib Test
55

66
on:
77
workflow_call:

‎.github/workflows/generate_workflows.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from pathlib import Path
22

33
from generate_workflows_lib import (
4+
generate_ci_workflow,
45
generate_contrib_workflow,
56
generate_lint_workflow,
67
generate_misc_workflow,
@@ -14,3 +15,4 @@
1415
generate_lint_workflow(tox_ini_path, workflows_directory_path)
1516
generate_misc_workflow(tox_ini_path, workflows_directory_path)
1617
generate_contrib_workflow(workflows_directory_path)
18+
generate_ci_workflow(workflows_directory_path)

‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/__init__.py‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -172,25 +172,18 @@ def get_misc_job_datas(tox_envs: list) -> list:
172172

173173

174174
def _generate_workflow(
175-
job_datas: list, name: str, workflow_directory_path: Path, max_jobs=250
176-
):
177-
# Github seems to limit the amount of jobs in a workflow file, that is why
178-
# they are split in groups of 250 per workflow file.
179-
for file_number, job_datas in enumerate(
180-
[
181-
job_datas[index : index + max_jobs]
182-
for index in range(0, len(job_datas), max_jobs)
183-
]
184-
):
185-
with open(
186-
workflow_directory_path.joinpath(f"{name}_{file_number}.yml"), "w"
187-
) as test_yml_file:
188-
test_yml_file.write(
189-
Environment(loader=FileSystemLoader(Path(__file__).parent))
190-
.get_template(f"{name}.yml.j2")
191-
.render(job_datas=job_datas, file_number=file_number)
175+
job_datas: list, name: str, workflow_directory_path: Path
176+
) -> None:
177+
env = Environment(loader=FileSystemLoader(Path(__file__).parent))
178+
with open(
179+
workflow_directory_path.joinpath(f"{name}.yml"), "w"
180+
) as yml_file:
181+
yml_file.write(
182+
env.get_template(f"{name}.yml.j2").render(
183+
job_datas=job_datas,
192184
)
193-
test_yml_file.write("\n")
185+
)
186+
yml_file.write("\n")
194187

195188

196189
def generate_test_workflow(
@@ -235,3 +228,15 @@ def generate_misc_workflow(
235228
"misc",
236229
workflow_directory_path,
237230
)
231+
232+
233+
def generate_ci_workflow(
234+
workflow_directory_path: Path,
235+
) -> None:
236+
with open(workflow_directory_path.joinpath("ci.yml"), "w") as ci_yml_file:
237+
ci_yml_file.write(
238+
Environment(loader=FileSystemLoader(Path(__file__).parent))
239+
.get_template("ci.yml.j2")
240+
.render()
241+
)
242+
ci_yml_file.write("\n")

‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/ci.yml.j2‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Do not edit this file.
2+
# This file is generated automatically by executing tox -e generate-workflows
3+
4+
name: CI
5+
6+
on:
7+
push:
8+
branches:
9+
- 'main'
10+
pull_request:
11+
12+
permissions:
13+
contents: read
14+
15+
concurrency:
16+
group: ${% raw %}{{ github.workflow }}-${{ github.head_ref || github.run_id }}{% endraw %}
17+
cancel-in-progress: true
18+
19+
jobs:
20+
misc:
21+
uses: ./.github/workflows/misc.yml
22+
lint:
23+
uses: ./.github/workflows/lint.yml
24+
tests:
25+
uses: ./.github/workflows/test.yml
26+
27+
check:
28+
if: always()
29+
needs:
30+
- misc
31+
- lint
32+
- tests
33+
runs-on: ubuntu-latest
34+
steps:
35+
- name: Decide whether the needed jobs succeeded or failed
36+
uses: re-actors/alls-green@release/v1
37+
with:
38+
jobs: ${% raw %}{{ toJSON(needs) }}{% endraw %}

‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
# Do not edit this file.
22
# This file is generated automatically by executing tox -e generate-workflows
33

4-
name: Lint {{ file_number }}
4+
name: Lint
55

66
on:
7-
push:
8-
branches:
9-
- 'main'
10-
pull_request:
7+
workflow_call:
118

129
permissions:
1310
contents: read
1411

15-
concurrency:
16-
group: ${% raw %}{{ github.workflow }}-${{ github.head_ref || github.run_id }}{% endraw %}
17-
cancel-in-progress: true
18-
1912
env:
2013
# Set the SHA to the branch name if the PR has a label 'prepare-release' or 'backport' otherwise, set it to 'main'
2114
# For PRs you can change the inner fallback ('main')

‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
# Do not edit this file.
22
# This file is generated automatically by executing tox -e generate-workflows
33

4-
name: Misc {{ file_number }}
4+
name: Misc
55

66
on:
7-
push:
8-
branches:
9-
- 'main'
10-
pull_request:
7+
workflow_call:
118

129
permissions:
1310
contents: read
1411

15-
concurrency:
16-
group: ${% raw %}{{ github.workflow }}-${{ github.head_ref || github.run_id }}{% endraw %}
17-
cancel-in-progress: true
18-
1912
env:
2013
# Set the SHA to the branch name if the PR has a label 'prepare-release' or 'backport' otherwise, set it to 'main'
2114
# For PRs you can change the inner fallback ('main')

‎.github/workflows/generate_workflows_lib/src/generate_workflows_lib/test.yml.j2‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
# Do not edit this file.
22
# This file is generated automatically by executing tox -e generate-workflows
33

4-
name: Test {{ file_number }}
4+
name: Test
55

66
on:
7-
push:
8-
branches:
9-
- 'main'
10-
pull_request:
7+
workflow_call:
118

129
permissions:
1310
contents: read
1411

15-
concurrency:
16-
group: ${% raw %}{{ github.workflow }}-${{ github.head_ref || github.run_id }}{% endraw %}
17-
cancel-in-progress: true
18-
1912
env:
2013
# Set the SHA to the branch name if the PR has a label 'prepare-release' or 'backport' otherwise, set it to 'main'
2114
# For PRs you can change the inner fallback ('main')

.github/workflows/lint_0.yml renamed to .github/workflows/lint.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
# Do not edit this file.
22
# This file is generated automatically by executing tox -e generate-workflows
33

4-
name: Lint 0
4+
name: Lint
55

66
on:
7-
push:
8-
branches:
9-
- 'main'
10-
pull_request:
7+
workflow_call:
118

129
permissions:
1310
contents: read
1411

15-
concurrency:
16-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
17-
cancel-in-progress: true
18-
1912
env:
2013
# Set the SHA to the branch name if the PR has a label 'prepare-release' or 'backport' otherwise, set it to 'main'
2114
# For PRs you can change the inner fallback ('main')

.github/workflows/misc_0.yml renamed to .github/workflows/misc.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
# Do not edit this file.
22
# This file is generated automatically by executing tox -e generate-workflows
33

4-
name: Misc 0
4+
name: Misc
55

66
on:
7-
push:
8-
branches:
9-
- 'main'
10-
pull_request:
7+
workflow_call:
118

129
permissions:
1310
contents: read
1411

15-
concurrency:
16-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
17-
cancel-in-progress: true
18-
1912
env:
2013
# Set the SHA to the branch name if the PR has a label 'prepare-release' or 'backport' otherwise, set it to 'main'
2114
# For PRs you can change the inner fallback ('main')

0 commit comments

Comments
 (0)