diff --git a/.github/run_ci_tests.py b/.github/run_ci_tests.py index 26e3a5b7..b13fa39b 100644 --- a/.github/run_ci_tests.py +++ b/.github/run_ci_tests.py @@ -59,6 +59,10 @@ def find_affected_directories(base_ref) -> list: if file: print(file) + if any(".github/workflows/ci.yml" in f for f in changed_files): + print("\nCI workflow changed - running all examples") + return [] + affected_dirs = set() for file_path in changed_files: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 267df92c..124333ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest, windows-2022] conan-version: [release, develop] runs-on: ${{ matrix.os }} steps: @@ -46,6 +46,12 @@ jobs: with: cmake-version: "3.23" + - name: Set up Java + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: "17" + - name: Install Bazel uses: bazel-contrib/setup-bazel@0.15.0 with: diff --git a/examples/libraries/protobuf/serialization/requirements.txt b/examples/libraries/protobuf/serialization/requirements.txt index 563ca39e..daeb9340 100644 --- a/examples/libraries/protobuf/serialization/requirements.txt +++ b/examples/libraries/protobuf/serialization/requirements.txt @@ -1 +1 @@ -protobuf==4.23.1 +protobuf>=5.27.2 diff --git a/tutorial/developing_packages/editable_packages/ci_test_example.py b/tutorial/developing_packages/editable_packages/ci_test_example.py index c829488e..ac73e0eb 100644 --- a/tutorial/developing_packages/editable_packages/ci_test_example.py +++ b/tutorial/developing_packages/editable_packages/ci_test_example.py @@ -49,11 +49,11 @@ with chdir("say"): replace(os.path.join("src", "say.cpp"), "Hello World", "Bye World") - if platform.system() == "Windows": - run(f"cmake --build --preset {prefix_preset_name}release") - run(f"cmake --build --preset {prefix_preset_name}debug") + if platform.system() == "Windows": + run(f"cmake --build --preset {prefix_preset_name}release --clean-first") + run(f"cmake --build --preset {prefix_preset_name}debug --clean-first") else: - run(f"cmake --build --preset {prefix_preset_name}release") + run(f"cmake --build --preset {prefix_preset_name}release --clean-first") with chdir("hello"): # Clean hello build to ensure it uses the updated say library