Followup fixes
diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml
index e160149..360b622 100644
--- a/.github/workflows/test_cpp.yml
+++ b/.github/workflows/test_cpp.yml
@@ -328,14 +328,13 @@
ref: ${{ inputs.safe-checkout }}
# Workaround for incompatibility between gcloud and windows-2019 runners.
- name: Install Python
- if: ${{ matrix.python-version }}
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
+ if: runner.os == 'Windows'
with:
- python-version: ${{ matrix.python-version }}
- cache: pip
+ python-version: '3.8'
- name: Use custom python for gcloud
- if: ${{ matrix.python-version }}
run: echo "CLOUDSDK_PYTHON=${Python3_ROOT_DIR}\\python3" >> $GITHUB_ENV
+ if: runner.os == 'Windows'
shell: bash
- name: Run tests
uses: protocolbuffers/protobuf-ci/bazel@v1
@@ -404,7 +403,6 @@
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
with:
python-version: ${{ matrix.python-version }}
- cache: pip
- name: Use custom python for gcloud
if: ${{ matrix.python-version }}
run: echo "CLOUDSDK_PYTHON=${Python3_ROOT_DIR}\\python3" >> $GITHUB_ENV
diff --git a/.github/workflows/test_python.yml b/.github/workflows/test_python.yml
index 36f4e5a..283065d 100644
--- a/.github/workflows/test_python.yml
+++ b/.github/workflows/test_python.yml
@@ -17,7 +17,7 @@
version: [ "3.7", "3.8", "3.9", "3.10" ]
include:
- type: Pure
- targets: //python/... @upb//python/... //python:python_version
+ targets: //python/... //python:python_version
flags: --define=use_fast_cpp_protos=false
- type: C++
targets: //python/... //python:python_version
@@ -54,7 +54,7 @@
version: [ "3.10" ]
include:
- type: Pure
- targets: //python/... @upb//python/... //python:python_version
+ targets: //python/... //python:python_version
- type: C++
targets: //python/... //python:python_version
flags: --define=use_fast_cpp_protos=true
