Skip to content

Commit 77613da

Browse files
authored
Drop selective enabled for windows and regenerate workflows (#2964)
1 parent 226258e commit 77613da

File tree

6 files changed

+5
-65
lines changed

6 files changed

+5
-65
lines changed

.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)

.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:

.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: 6e29e0e5f19ee08eaf683166f2867dd2d383f67e
13+
CORE_REPO_SHA: main
1414
CONTRIB_REPO_SHA: main
1515
PIP_EXISTS_ACTION: w
1616

.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: 6e29e0e5f19ee08eaf683166f2867dd2d383f67e
13+
CORE_REPO_SHA: main
1414
CONTRIB_REPO_SHA: main
1515
PIP_EXISTS_ACTION: w
1616

.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: 6e29e0e5f19ee08eaf683166f2867dd2d383f67e
13+
CORE_REPO_SHA: main
1414
CONTRIB_REPO_SHA: main
1515
PIP_EXISTS_ACTION: w
1616

.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: 6e29e0e5f19ee08eaf683166f2867dd2d383f67e
13+
CORE_REPO_SHA: main
1414
CONTRIB_REPO_SHA: main
1515
PIP_EXISTS_ACTION: w
1616

@@ -3903,45 +3903,3 @@ jobs:
39033903

39043904
- name: Run tests
39053905
run: tox -e pypy3-test-processor-baggage -- -ra
3906-
3907-
py312-test-instrumentation-botocore_windows-latest:
3908-
name: instrumentation-botocore 3.12 Windows
3909-
runs-on: windows-latest
3910-
steps:
3911-
- name: Checkout repo @ SHA - ${{ github.sha }}
3912-
uses: actions/checkout@v4
3913-
3914-
- name: Set up Python 3.12
3915-
uses: actions/setup-python@v5
3916-
with:
3917-
python-version: "3.12"
3918-
3919-
- name: Install tox
3920-
run: pip install tox
3921-
3922-
- name: Configure git to support long filenames
3923-
run: git config --system core.longpaths true
3924-
3925-
- name: Run tests
3926-
run: tox -e py312-test-instrumentation-botocore -- -ra
3927-
3928-
py312-test-instrumentation-system-metrics_windows-latest:
3929-
name: instrumentation-system-metrics 3.12 Windows
3930-
runs-on: windows-latest
3931-
steps:
3932-
- name: Checkout repo @ SHA - ${{ github.sha }}
3933-
uses: actions/checkout@v4
3934-
3935-
- name: Set up Python 3.12
3936-
uses: actions/setup-python@v5
3937-
with:
3938-
python-version: "3.12"
3939-
3940-
- name: Install tox
3941-
run: pip install tox
3942-
3943-
- name: Configure git to support long filenames
3944-
run: git config --system core.longpaths true
3945-
3946-
- name: Run tests
3947-
run: tox -e py312-test-instrumentation-system-metrics -- -ra

0 commit comments

Comments
 (0)