Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
s0l0ist committed Oct 2, 2024
1 parent 3b94bec commit ab5650e
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 18 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/CD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,26 @@ jobs:
strategy:
matrix:
os: [ubuntu-24.04, macos-14]
# Bazel uses hermetic python, these are just placeholders
python-version: ['3_8', '3_9', '3_10', '3_11']
python-version:
- { X_Y: '3_8', X_DOT_Y: '3.8' }
- { X_Y: '3_9', X_DOT_Y: '3.9' }
- { X_Y: '3_10', X_DOT_Y: '3.10' }
- { X_Y: '3_11', X_DOT_Y: '3.11' }
- { X_Y: '3_12', X_DOT_Y: '3.12' }
steps:
- uses: actions/checkout@v4
# configuring python for bazel abi and platform repo rules
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
- name: Python deps
run: |
python -m pip install --upgrade pip
pip install --upgrade packaging
- name: Run tests nix
timeout-minutes: 30
run: bazel test --test_output=all //private_set_intersection/python:test_${{ matrix.python-version }}
run: bazel test --test_output=all //private_set_intersection/python:test_${{ matrix.python-version.X_Y }} --@rules_python//python/config_settings:python_version=${{ matrix.python-version.X_DOT_Y }}

Go:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -122,7 +126,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install --upgrade packaging
bazel run -c opt //private_set_intersection/python:wheel.publish -- --verbose --skip-existing
bazel run -c opt //private_set_intersection/python:wheel.publish --@rules_python//python/config_settings:python_version=${{ matrix.python-version }} -- --verbose --skip-existing
Publish-python:
needs: [Core, JS, Go, Python, Rust]
Expand All @@ -145,4 +149,4 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install --upgrade packaging
bazel run -c opt //private_set_intersection/python:wheel.publish -- --verbose --skip-existing
bazel run -c opt //private_set_intersection/python:wheel.publish --@rules_python//python/config_settings:python_version=${{ matrix.python-version }} -- --verbose --skip-existing
13 changes: 10 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ jobs:
- 'private_set_intersection/go/**'
- '.bazelrc'
- '.bazelversion'
- 'MODULE.bazel'
- 'MODULE.bazel.lock'
- 'WORKSPACE'
javascript:
- 'private_set_intersection/javascript/**'
Expand Down Expand Up @@ -122,21 +124,26 @@ jobs:
os:
[ubuntu-24.04, macos-14]
# Bazel uses hermetic python, these are just placeholders
python-version: ['3_8', '3_9', '3_10', '3_11', '3_12']
python-version:
- { X_Y: '3_8', X_DOT_Y: '3.8' }
- { X_Y: '3_9', X_DOT_Y: '3.9' }
- { X_Y: '3_10', X_DOT_Y: '3.10' }
- { X_Y: '3_11', X_DOT_Y: '3.11' }
- { X_Y: '3_12', X_DOT_Y: '3.12' }
steps:
- uses: actions/checkout@v4
# configuring python for bazel abi and platform repo rules
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
- name: Python deps
run: |
python -m pip install --upgrade pip
pip install --upgrade packaging
- name: Run tests nix
timeout-minutes: 30
run: bazel test --test_output=all //private_set_intersection/python:test_${{ matrix.python-version }}
run: bazel test --test_output=all //private_set_intersection/python:test_${{ matrix.python-version.X_Y }} --@rules_python//python/config_settings:python_version=${{ matrix.python-version.X_DOT_Y }}

Go:
needs: changes
Expand Down
7 changes: 3 additions & 4 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,14 @@ bazel_dep(name = "rules_proto_grpc_cpp", version = "5.0.0")
bazel_dep(name = "rules_proto_grpc_go", version = "5.0.0")
bazel_dep(name = "rules_proto_grpc_python", version = "5.0.0")
bazel_dep(name = "rules_python", version = "0.36.0")
bazel_dep(name = "rules_python_gazelle_plugin", version = "0.36.0")
bazel_dep(name = "rules_rust", version = "0.51.0")

## PCJ
http_archive(
name = "private_join_and_compute",
sha256 = "9702d5e1e4deeb111e235952e1e831dc9d9f0127ed8a1a30112b235d11f3e937",
strip_prefix = "private-join-and-compute-2f678958e1b5a1a86adf96830c7c21d9cb2075f3",
url = "https://github.com/s0l0ist/private-join-and-compute/archive/2f678958e1b5a1a86adf96830c7c21d9cb2075f3.zip",
sha256 = "4a2916c42af1d32d3a94799703a81b11e05dbf1d4e0021e25f181d5921f667bf",
strip_prefix = "private-join-and-compute-1225a27f13fb39359242db3da3c090b81d24cced",
url = "https://github.com/s0l0ist/private-join-and-compute/archive/1225a27f13fb39359242db3da3c090b81d24cced.zip",
)

## Python
Expand Down
7 changes: 2 additions & 5 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ab5650e

Please sign in to comment.