From 5f8f676da4593fc8f59ccbf21891a5fb9594b51a Mon Sep 17 00:00:00 2001 From: Nick Angelou Date: Tue, 16 Jan 2024 18:04:53 -0600 Subject: [PATCH] update --- .bazelversion | 2 +- .github/workflows/CD.yml | 18 +++++++++++++++--- .github/workflows/CI.yml | 14 +++++++++++++- CHANGES.md | 8 ++++++++ package-lock.json | 4 ++-- package.json | 2 +- tools/package.bzl | 2 +- 7 files changed, 41 insertions(+), 9 deletions(-) diff --git a/.bazelversion b/.bazelversion index 09b254e9..19b860c1 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -6.0.0 +6.4.0 diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 2f116a2c..05abe30e 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -21,6 +21,9 @@ jobs: os: [ubuntu-22.04, macos-12] steps: - uses: actions/checkout@v3 + - uses: actions/setup-python@v5 + with: + python-version: '3.10' - name: Run tests nix timeout-minutes: 60 run: .github/workflows/scripts/run_tests_core.sh @@ -35,6 +38,9 @@ jobs: os: [ubuntu-22.04, macos-12] steps: - uses: actions/checkout@v3 + - uses: actions/setup-python@v5 + with: + python-version: '3.10' - name: Run tests nix timeout-minutes: 60 run: .github/workflows/scripts/run_tests_js.sh @@ -48,7 +54,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Run tests nix @@ -72,6 +78,9 @@ jobs: - name: Install Go dependencies run: go install golang.org/x/lint/golint@latest - uses: actions/checkout@v3 + - uses: actions/setup-python@v5 + with: + python-version: '3.10' - name: Run tests nix timeout-minutes: 30 run: .github/workflows/scripts/run_tests_go.sh @@ -90,6 +99,9 @@ jobs: toolchain: stable default: true - uses: actions/checkout@v3 + - uses: actions/setup-python@v5 + with: + python-version: '3.10' - name: Run tests nix timeout-minutes: 30 run: .github/workflows/scripts/run_tests_rust.sh @@ -108,7 +120,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Build and publish the python wheel @@ -132,7 +144,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Build and publish the python wheel diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 1022b9c7..cef416ec 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -85,6 +85,9 @@ jobs: os: [ubuntu-22.04, macos-12] steps: - uses: actions/checkout@v3 + - uses: actions/setup-python@v5 + with: + python-version: '3.10' - name: Run tests nix timeout-minutes: 60 run: .github/workflows/scripts/run_tests_core.sh @@ -101,6 +104,9 @@ jobs: os: [ubuntu-22.04, macos-12] steps: - uses: actions/checkout@v3 + - uses: actions/setup-python@v5 + with: + python-version: '3.10' - name: Run tests nix timeout-minutes: 60 run: .github/workflows/scripts/run_tests_js.sh @@ -116,7 +122,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Run tests nix @@ -142,6 +148,9 @@ jobs: - name: Install Go dependencies run: go install golang.org/x/lint/golint@latest - uses: actions/checkout@v3 + - uses: actions/setup-python@v5 + with: + python-version: '3.10' - name: Run tests nix timeout-minutes: 30 run: .github/workflows/scripts/run_tests_go.sh @@ -162,6 +171,9 @@ jobs: toolchain: stable default: true - uses: actions/checkout@v3 + - uses: actions/setup-python@v5 + with: + python-version: '3.10' - name: Run tests nix timeout-minutes: 30 run: .github/workflows/scripts/run_tests_rust.sh diff --git a/CHANGES.md b/CHANGES.md index dfa09edb..40d5648a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,11 @@ +# Version 2.0.2 + +Chore: + +- Update to use Bazel 6.4.0 +- Updated some of the Bazel dependencies for Golang and Python +- Updated CI/CD to use python 3.10 for Bazel to work correctly. + # Version 2.0.1 Feat: diff --git a/package-lock.json b/package-lock.json index 25e718c2..58cf0260 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@openmined/psi.js", - "version": "2.0.1", + "version": "2.0.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@openmined/psi.js", - "version": "2.0.1", + "version": "2.0.2", "license": "Apache-2.0", "dependencies": { "@grpc/grpc-js": "^1.9.1", diff --git a/package.json b/package.json index 9fa1c755..590e2fff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openmined/psi.js", - "version": "2.0.1", + "version": "2.0.2", "description": "Private Set Intersection for JavaScript", "repository": { "type": "git", diff --git a/tools/package.bzl b/tools/package.bzl index 663d1cff..0b6b4d65 100644 --- a/tools/package.bzl +++ b/tools/package.bzl @@ -1,2 +1,2 @@ """ Version of the current release """ -VERSION_LABEL = "2.0.1" +VERSION_LABEL = "2.0.2"