Skip to content

Commit

Permalink
Drop selective enabled for windows and regenerate workflows (open-tel…
Browse files Browse the repository at this point in the history
  • Loading branch information
xrmx authored Nov 6, 2024
1 parent 226258e commit 77613da
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 65 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/generate_workflows.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
tox_ini_path = Path(__file__).parent.parent.parent.joinpath("tox.ini")
workflows_directory_path = Path(__file__).parent

generate_test_workflow(
tox_ini_path, workflows_directory_path, "ubuntu-latest", "windows-latest"
)
generate_test_workflow(tox_ini_path, workflows_directory_path, "ubuntu-latest")
generate_lint_workflow(tox_ini_path, workflows_directory_path)
generate_misc_workflow(tox_ini_path, workflows_directory_path)
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,6 @@ def get_test_job_datas(tox_envs: list, operating_systems: list) -> list:
"py312": "3.12",
}

# we enable windows testing only for packages with windows specific code paths
per_tox_env_os_enablement = {
"windows-latest": {
"py312-test-instrumentation-botocore",
"py312-test-instrumentation-system-metrics",
},
}

test_job_datas = []

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

# if we have an entry for the os add only jobs for tox env manually configured
packages_manually_enabled = per_tox_env_os_enablement.get(
operating_system
)
if packages_manually_enabled:
if tox_env not in packages_manually_enabled:
continue

test_requirements = groups["test_requirements"]

if test_requirements is None:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint_0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
pull_request:

env:
CORE_REPO_SHA: 6e29e0e5f19ee08eaf683166f2867dd2d383f67e
CORE_REPO_SHA: main
CONTRIB_REPO_SHA: main
PIP_EXISTS_ACTION: w

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/misc_0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
pull_request:

env:
CORE_REPO_SHA: 6e29e0e5f19ee08eaf683166f2867dd2d383f67e
CORE_REPO_SHA: main
CONTRIB_REPO_SHA: main
PIP_EXISTS_ACTION: w

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
pull_request:

env:
CORE_REPO_SHA: 6e29e0e5f19ee08eaf683166f2867dd2d383f67e
CORE_REPO_SHA: main
CONTRIB_REPO_SHA: main
PIP_EXISTS_ACTION: w

Expand Down
44 changes: 1 addition & 43 deletions .github/workflows/test_1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
pull_request:

env:
CORE_REPO_SHA: 6e29e0e5f19ee08eaf683166f2867dd2d383f67e
CORE_REPO_SHA: main
CONTRIB_REPO_SHA: main
PIP_EXISTS_ACTION: w

Expand Down Expand Up @@ -3903,45 +3903,3 @@ jobs:

- name: Run tests
run: tox -e pypy3-test-processor-baggage -- -ra

py312-test-instrumentation-botocore_windows-latest:
name: instrumentation-botocore 3.12 Windows
runs-on: windows-latest
steps:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4

- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: "3.12"

- name: Install tox
run: pip install tox

- name: Configure git to support long filenames
run: git config --system core.longpaths true

- name: Run tests
run: tox -e py312-test-instrumentation-botocore -- -ra

py312-test-instrumentation-system-metrics_windows-latest:
name: instrumentation-system-metrics 3.12 Windows
runs-on: windows-latest
steps:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4

- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: "3.12"

- name: Install tox
run: pip install tox

- name: Configure git to support long filenames
run: git config --system core.longpaths true

- name: Run tests
run: tox -e py312-test-instrumentation-system-metrics -- -ra

0 comments on commit 77613da

Please sign in to comment.