Nits based on last review
diff --git a/.github/workflows/staleness_check.yml b/.github/workflows/staleness_check.yml index b11cdd5..de40b0d 100644 --- a/.github/workflows/staleness_check.yml +++ b/.github/workflows/staleness_check.yml
@@ -31,11 +31,11 @@ - branch: ${{ !inputs.continuous-run && '27.x' }} - branch: ${{ !inputs.continuous-run && '28.x' }} - name: Test staleness ${{ matrix.os.name }} ${{ matrix.branch }} + name: Test staleness ${{ matrix.os.name }} ${{ github.head_ref && 'PR' || matrix.branch }} runs-on: ${{ matrix.os.value }} if: ${{ github.event.repository.full_name == 'protocolbuffers/protobuf' }} steps: - - name: Checkout ${{ matrix.branch }} + - name: Checkout ${{ github.head_ref && 'PR' || matrix.branch }} uses: protocolbuffers/protobuf-ci/checkout@v3 with: ref: ${{ inputs.safe-checkout || github.head_ref || matrix.branch }}
diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml index b1e2096..e34c087 100644 --- a/.github/workflows/test_cpp.yml +++ b/.github/workflows/test_cpp.yml
@@ -141,7 +141,6 @@ matrix: include: - flags: -Dprotobuf_BUILD_EXAMPLES=ON -DCMAKE_CXX_STANDARD=14 - continuous-only: false - name: Ninja flags: -G Ninja -DCMAKE_CXX_STANDARD=14 continuous-only: true @@ -150,7 +149,6 @@ continuous-only: true - name: C++17 flags: -DCMAKE_CXX_STANDARD=17 - continuous-only: false # TODO Re-enable this. #- name: C++20 # flags: -DCMAKE_CXX_STANDARD=20 @@ -253,13 +251,11 @@ include: - name: C++14 flags: -DCMAKE_CXX_STANDARD=14 - continuous-only: false - name: C++17 flags: -DCMAKE_CXX_STANDARD=17 continuous-only: true - name: C++20 flags: -DCMAKE_CXX_STANDARD=20 - continuous-only: false name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux CMake GCC ${{ matrix.name }} runs-on: ubuntu-latest @@ -359,7 +355,6 @@ os: macos-12 cache_key: macos-12 bazel: test //src/... //third_party/utf8_range/... - continuous-only: false - name: MacOS Bazel 7 os: macos-12 cache_key: macos-12-bazel7 @@ -372,12 +367,10 @@ # Current github runners are all Intel based, so just build/compile # for Apple Silicon to detect issues there. bazel: build --cpu=darwin_arm64 //src/... //third_party/utf8_range/... - continuous-only: false - name: Windows Bazel os: windows-2022 cache_key: windows-2022 bazel: test //src/... @com_google_protobuf_examples//... --test_tag_filters=-conformance --build_tag_filters=-conformance - continuous-only: false - name: Windows Bazel 7 os: windows-2022 cache_key: windows-2022-bazel7 @@ -446,7 +439,6 @@ -Dprotobuf_BUILD_SHARED_LIBS=ON vsversion: '2022' cache-prefix: windows-2022-cmake - continuous-only: false - name: Windows CMake Install os: windows-2022 install-flags: -G Ninja -Dprotobuf_WITH_ZLIB=OFF -Dprotobuf_BUILD_CONFORMANCE=OFF -Dprotobuf_BUILD_TESTS=OFF
diff --git a/.github/workflows/test_java.yml b/.github/workflows/test_java.yml index 96c778c..afe5f04 100644 --- a/.github/workflows/test_java.yml +++ b/.github/workflows/test_java.yml
@@ -43,7 +43,6 @@ cache_key: '17' image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:17-1fdbb997433cb22c1e49ef75ad374a8d6bb88702 targets: //java/... //java/internal:java_version //compatibility/... - continuous-only: false - name: Bazel7 cache_key: 'bazel7nobzlmod' image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-cf84e92285ca133b9c8104ad7b14d70e953cbb8e @@ -58,7 +57,6 @@ cache_key: 'aarch64' image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-63dd26c0c7a808d92673a3e52e848189d4ab0f17 targets: //java/... //compatibility/... //src/google/protobuf/compiler:protoc_aarch64_test - continuous-only: false name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux ${{ matrix.name }} runs-on: ubuntu-latest
diff --git a/.github/workflows/test_objectivec.yml b/.github/workflows/test_objectivec.yml index a6694a4..874de51 100644 --- a/.github/workflows/test_objectivec.yml +++ b/.github/workflows/test_objectivec.yml
@@ -39,7 +39,6 @@ xc_project: "ProtocolBuffers_iOS.xcodeproj" # We run presubmits on all "Debug" entries, but not on "Release" entries - xc_config: "Debug" - continuous-only: false - xc_config: "Release" continuous-only: true @@ -97,7 +96,6 @@ XCODE: "15.2" # We run presubmits on all "Debug" entries, but not on "Release" entries - CONFIGURATION: "Debug" - continuous-only: false - CONFIGURATION: "Release" continuous-only: true name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} CocoaPods ${{ matrix.PLATFORM }} ${{ matrix.CONFIGURATION }} @@ -136,7 +134,6 @@ - name: Debug flags: --config=dbg bazel_action: test - continuous-only: false # Current github runners are all Intel based, so just build/compile # for Apple Silicon to detect issues there. - name: Apple_Silicon_Optimized @@ -146,7 +143,6 @@ - name: Apple_Silicon_Debug flags: --config=dbg --cpu=darwin_arm64 bazel_action: build - continuous-only: false # TODO: Could add iOS to atleast build the objc_library targets for that. platform: ["macOS"] include:
diff --git a/.github/workflows/test_php.yml b/.github/workflows/test_php.yml index dea9c08..fbc48e1 100644 --- a/.github/workflows/test_php.yml +++ b/.github/workflows/test_php.yml
@@ -32,45 +32,43 @@ version: "8.1.14" version-short: "8.1" command: composer test \&\& composer test_c - presubmit: true - name: 8.1 Debug version: 8.1.14-dbg version-short: "8.1" command: composer test \&\& composer test_c - presubmit: false + continuous-only: true - name: 8.1 Memory Leak version: 8.1.14-dbg version-short: "8.1" # Run specialized memory leak & multirequest tests. command: composer test_c \&\& tests/multirequest.sh \&\& tests/memory_leak_test.sh - presubmit: false + continuous-only: true - name: 8.1 Valgrind version: 8.1.14-dbg version-short: "8.1" command: composer test_valgrind - presubmit: false + continuous-only: true - name: 8.3 Optimized version: "8.3.1" version-short: "8.3" command: composer test \&\& composer test_c - presubmit: true - name: ${{ !matrix.presubmit && inputs.continuous-prefix || '' }} Linux ${{ matrix.name}} + name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux ${{ matrix.name}} runs-on: ubuntu-latest steps: - name: Checkout pending changes - if: ${{ matrix.presubmit || inputs.continuous-run }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/checkout@v3 with: ref: ${{ inputs.safe-checkout }} - name: Setup composer - if: ${{ matrix.presubmit || inputs.continuous-run }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/composer-setup@v3 with: cache-prefix: php-${{ matrix.version-short }} directory: php - name: Run tests - if: ${{ matrix.presubmit || inputs.continuous-run }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/docker@v3 with: image: us-docker.pkg.dev/protobuf-build/containers/test/linux/php:${{ matrix.version }}-66964dc8b07b6d1fc73a5cc14e59e84c1c534cea @@ -91,27 +89,26 @@ include: - suffix: '-zts' suffix_name: ' Thread Safe' - presubmit: false + continuous-only: true - test: 'test_c' test_name: ' Extension' - presubmit: false + continuous-only: true - suffix: '' test: 'test' - presubmit: true - name: ${{ !matrix.presubmit && inputs.continuous-prefix || '' }} Linux 32-bit ${{ matrix.version}}${{ matrix.suffix_name }}${{ matrix.test_name }} + name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux 32-bit ${{ matrix.version}}${{ matrix.suffix_name }}${{ matrix.test_name }} runs-on: ubuntu-latest env: image: us-docker.pkg.dev/protobuf-build/containers/test/linux/32bit@sha256:836f2cedcfe351d9a30055076630408e61994fc7d783e8333a99570968990eeb steps: - name: Checkout pending changes - if: ${{ matrix.presubmit || inputs.continuous-run }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/checkout@v3 with: ref: ${{ inputs.safe-checkout }} - name: Cross compile protoc for i386 - if: ${{ matrix.presubmit || inputs.continuous-run }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} id: cross-compile uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v3 with: @@ -120,14 +117,14 @@ architecture: linux-i386 - name: Setup composer - if: ${{ matrix.presubmit || inputs.continuous-run }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/composer-setup@v3 with: cache-prefix: php-${{ matrix.version }} directory: php - name: Run tests - if: ${{ matrix.presubmit || inputs.continuous-run }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/docker@v3 with: image: ${{ env.image }} @@ -184,46 +181,45 @@ matrix: include: - version: '8.2' - presubmit: false + continuous-only: true - version: '8.3' - presubmit: true - name: ${{ !matrix.presubmit && inputs.continuous-prefix || '' }} MacOS PHP ${{ matrix.version }} + name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} MacOS PHP ${{ matrix.version }} runs-on: macos-12 steps: - name: Checkout pending changes - if: ${{ matrix.presubmit || inputs.continuous-run }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/checkout@v3 with: ref: ${{ inputs.safe-checkout }} - name: Uninstall problematic libgd - if: ${{ matrix.presubmit || inputs.continuous-run }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} run: brew uninstall --ignore-dependencies gd - name: Install dependencies - if: ${{ matrix.presubmit || inputs.continuous-run }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} run: brew install coreutils gd - name: Pin PHP version - if: ${{ matrix.presubmit || inputs.continuous-run }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} uses: shivammathur/setup-php@8872c784b04a1420e81191df5d64fbd59d3d3033 # 2.30.2 with: php-version: ${{ matrix.version }} - name: Check PHP version - if: ${{ matrix.presubmit || inputs.continuous-run }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} run: php --version | grep ${{ matrix.version }} || (echo "Invalid PHP version - $(php --version)" && exit 1) - name: Setup composer - if: ${{ matrix.presubmit || inputs.continuous-run }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/composer-setup@v3 with: cache-prefix: php-${{ matrix.version }} directory: php - name: Run tests - if: ${{ matrix.presubmit || inputs.continuous-run }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/bash@v3 with: credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} @@ -236,7 +232,7 @@ popd - name: Run conformance tests - if: ${{ matrix.presubmit || inputs.continuous-run }} + if: ${{ !matrix.continuous-only || inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/bazel@v3 with: credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
diff --git a/.github/workflows/test_php_ext.yml b/.github/workflows/test_php_ext.yml index 826e3fd..f9a60ea 100644 --- a/.github/workflows/test_php_ext.yml +++ b/.github/workflows/test_php_ext.yml
@@ -57,7 +57,6 @@ - version: "8.2" continuous-only: true - version: "8.3" - continuous-only: false name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Build ${{ matrix.version }} runs-on: ubuntu-latest steps:
diff --git a/.github/workflows/test_python.yml b/.github/workflows/test_python.yml index 03b018f..a7cf85f 100644 --- a/.github/workflows/test_python.yml +++ b/.github/workflows/test_python.yml
@@ -42,15 +42,12 @@ # TODO Enable this once conformance tests are fixed. flags: --define=use_fast_cpp_protos=true --test_tag_filters=-conformance image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-63dd26c0c7a808d92673a3e52e848189d4ab0f17 - continuous-only: false - version: "3.8" - continuous-only: false - version: "3.9" continuous-only: true - version: "3.10" continuous-only: true - version: "3.11" - continuous-only: false name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux ${{ matrix.type }} ${{ matrix.version }} runs-on: ubuntu-latest