Skip to content

Commit e4ab0d8

Browse files
xrmxlzchen
authored andcommitted
Drop selective enabled for windows and regenerate workflows (#2964)
1 parent 0855740 commit e4ab0d8

File tree

6 files changed

+5
-65
lines changed

6 files changed

+5
-65
lines changed

Diff for: .github/workflows/generate_workflows.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
tox_ini_path = Path(__file__).parent.parent.parent.joinpath("tox.ini")
1010
workflows_directory_path = Path(__file__).parent
1111

12-
generate_test_workflow(
13-
tox_ini_path, workflows_directory_path, "ubuntu-latest", "windows-latest"
14-
)
12+
generate_test_workflow(tox_ini_path, workflows_directory_path, "ubuntu-latest")
1513
generate_lint_workflow(tox_ini_path, workflows_directory_path)
1614
generate_misc_workflow(tox_ini_path, workflows_directory_path)

Diff for: .github/workflows/generate_workflows_lib/src/generate_workflows_lib/__init__.py

-16
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,6 @@ def get_test_job_datas(tox_envs: list, operating_systems: list) -> list:
5555
"py312": "3.12",
5656
}
5757

58-
# we enable windows testing only for packages with windows specific code paths
59-
per_tox_env_os_enablement = {
60-
"windows-latest": {
61-
"py312-test-instrumentation-botocore",
62-
"py312-test-instrumentation-system-metrics",
63-
},
64-
}
65-
6658
test_job_datas = []
6759

6860
for operating_system in operating_systems:
@@ -79,14 +71,6 @@ def get_test_job_datas(tox_envs: list, operating_systems: list) -> list:
7971
]
8072
tox_env = tox_test_env_match.string
8173

82-
# if we have an entry for the os add only jobs for tox env manually configured
83-
packages_manually_enabled = per_tox_env_os_enablement.get(
84-
operating_system
85-
)
86-
if packages_manually_enabled:
87-
if tox_env not in packages_manually_enabled:
88-
continue
89-
9074
test_requirements = groups["test_requirements"]
9175

9276
if test_requirements is None:

Diff for: .github/workflows/lint_0.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
pull_request:
1111

1212
env:
13-
CORE_REPO_SHA: b9240e73fb4a5c493a753cc9baa865e2d9a817a3
13+
CORE_REPO_SHA: main
1414
CONTRIB_REPO_SHA: main
1515
PIP_EXISTS_ACTION: w
1616

Diff for: .github/workflows/misc_0.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
pull_request:
1111

1212
env:
13-
CORE_REPO_SHA: b9240e73fb4a5c493a753cc9baa865e2d9a817a3
13+
CORE_REPO_SHA: main
1414
CONTRIB_REPO_SHA: main
1515
PIP_EXISTS_ACTION: w
1616

Diff for: .github/workflows/test_0.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
pull_request:
1111

1212
env:
13-
CORE_REPO_SHA: b9240e73fb4a5c493a753cc9baa865e2d9a817a3
13+
CORE_REPO_SHA: main
1414
CONTRIB_REPO_SHA: main
1515
PIP_EXISTS_ACTION: w
1616

Diff for: .github/workflows/test_1.yml

+1-43
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
pull_request:
1111

1212
env:
13-
CORE_REPO_SHA: b9240e73fb4a5c493a753cc9baa865e2d9a817a3
13+
CORE_REPO_SHA: main
1414
CONTRIB_REPO_SHA: main
1515
PIP_EXISTS_ACTION: w
1616

@@ -4011,45 +4011,3 @@ jobs:
40114011

40124012
- name: Run tests
40134013
run: tox -e pypy3-test-processor-baggage -- -ra
4014-
4015-
py312-test-instrumentation-botocore_windows-latest:
4016-
name: instrumentation-botocore 3.12 Windows
4017-
runs-on: windows-latest
4018-
steps:
4019-
- name: Checkout repo @ SHA - ${{ github.sha }}
4020-
uses: actions/checkout@v4
4021-
4022-
- name: Set up Python 3.12
4023-
uses: actions/setup-python@v5
4024-
with:
4025-
python-version: "3.12"
4026-
4027-
- name: Install tox
4028-
run: pip install tox
4029-
4030-
- name: Configure git to support long filenames
4031-
run: git config --system core.longpaths true
4032-
4033-
- name: Run tests
4034-
run: tox -e py312-test-instrumentation-botocore -- -ra
4035-
4036-
py312-test-instrumentation-system-metrics_windows-latest:
4037-
name: instrumentation-system-metrics 3.12 Windows
4038-
runs-on: windows-latest
4039-
steps:
4040-
- name: Checkout repo @ SHA - ${{ github.sha }}
4041-
uses: actions/checkout@v4
4042-
4043-
- name: Set up Python 3.12
4044-
uses: actions/setup-python@v5
4045-
with:
4046-
python-version: "3.12"
4047-
4048-
- name: Install tox
4049-
run: pip install tox
4050-
4051-
- name: Configure git to support long filenames
4052-
run: git config --system core.longpaths true
4053-
4054-
- name: Run tests
4055-
run: tox -e py312-test-instrumentation-system-metrics -- -ra

0 commit comments

Comments
 (0)