Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop using ec2 runners in the conda+linux workflow #1302

Merged
merged 4 commits into from
Feb 14, 2024
Merged

Stop using ec2 runners in the conda+linux workflow #1302

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d0c743
Do not use ec2
poodlewars Feb 5, 2024
ffa771d
Fix mongo test server fixture, falling back to localhost
joe-iddon Feb 13, 2024
09e0a3b
Remove the isolated mongo fixture testing script.
joe-iddon Feb 13, 2024
6add36e
Refined test fixture logging
joe-iddon Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ jobs:
cmake_preset_type: ${{needs.common_config.outputs.cmake_preset_type_resolved}}
cibw_image_tag: ${{needs.cibw_docker_image.outputs.tag}}
matrix: ${{needs.common_config.outputs.linux_matrix}}
compile-override: compile-on-ec2

build-python-wheels-linux:
# Then use the cached compilation artifacts to build other python versions concurrently in cibuildwheels
Expand Down Expand Up @@ -187,7 +186,6 @@ jobs:
matrix: ${{toJson(matrix.matrix_override)}}
python_deps_ids: ${{toJson(matrix.python_deps_ids)}}
persistent_storage: ${{inputs.persistent_storage}}
compile-override: compile-on-ec2
pytest_xdist_mode: ${{matrix.pytest_xdist_mode}}

cpp-test-windows:
Expand Down
20 changes: 1 addition & 19 deletions .github/workflows/build_with_conda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,12 @@ on:
pull_request:

jobs:
start_ec2_runner:
uses: ./.github/workflows/ec2_runner_jobs.yml
secrets: inherit
permissions: write-all
with:
job_type: start

linux:
if: |
always() &&
!cancelled()
needs: [start_ec2_runner]
runs-on: ${{ needs.start_ec2_runner.result != 'failure' && needs.start_ec2_runner.outputs.label || 'ubuntu-latest'}}
runs-on: ubuntu-latest
services:
mongodb:
image: mongo:4.4
Expand Down Expand Up @@ -83,17 +76,6 @@ jobs:
env:
ARCTICDB_USING_CONDA: 1

stop-ec2-runner:
needs: [start_ec2_runner, linux]
if: ${{ always() }}
uses: ./.github/workflows/ec2_runner_jobs.yml
secrets: inherit
permissions: write-all
with:
job_type: stop
label: ${{ needs.start_ec2_runner.outputs.label }}
ec2-instance-id: ${{ needs.start_ec2_runner.outputs.ec2-instance-id }}

macos:
strategy:
matrix:
Expand Down
Loading