diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml index 7379f71e51..19a16eaf8f 100644 --- a/.github/workflows/test_cpp.yml +++ b/.github/workflows/test_cpp.yml @@ -214,24 +214,26 @@ jobs: -DCMAKE_CXX_STANDARD=14 -Dprotobuf_USE_EXTERNAL_GTEST=ON -Dprotobuf_ABSL_PROVIDER=package + # This test should always be skipped on presubmit linux-cmake-examples: - name: Linux CMake Examples - # Skip this test on presubmit - if: ${{ inputs.continuous-run }} + name: ${{ inputs.continuous-prefix }} Linux CMake Examples runs-on: ubuntu-latest steps: - name: Checkout pending changes + if: ${{ inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/checkout@v3 with: ref: ${{ inputs.safe-checkout }} - name: Setup sccache + if: ${{ inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/sccache@v3 with: cache-prefix: linux-cmake-examples credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} - name: Run tests + if: ${{ inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/docker@v3 with: image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.13.3-63dd26c0c7a808d92673a3e52e848189d4ab0f17 diff --git a/.github/workflows/test_ruby.yml b/.github/workflows/test_ruby.yml index a80475c0b1..2b636549cf 100644 --- a/.github/workflows/test_ruby.yml +++ b/.github/workflows/test_ruby.yml @@ -168,6 +168,7 @@ jobs: bazel-cache: ruby_macos/${{ matrix.version }} bazel: test //ruby/... --test_env=KOKORO_RUBY_VERSION=${{ matrix.version }} --test_env=BAZEL=true ${{ matrix.ffi == 'FFI' && '--//ruby:ffi=enabled --test_env=PROTOCOL_BUFFERS_RUBY_IMPLEMENTATION=FFI' || '' }} + # This test should always be skipped on presubmit test_ruby_gems: strategy: fail-fast: false @@ -183,16 +184,16 @@ jobs: - { name: Ruby 3.3, ruby: ruby-3.3.0, ffi: FFI } - { name: JRuby 9.4, ruby: jruby-9.4.6.0, ffi: NATIVE } - { name: JRuby 9.4, ruby: jruby-9.4.6.0, ffi: FFI } - name: (Continuous) Install ${{ matrix.name }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }} - # None of these ruby gem tests should be run on presubmit - if: ${{ inputs.continuous-run }} + name: ${{ inputs.continuous-prefix }} Install ${{ matrix.name }}${{ matrix.ffi == 'FFI' && ' FFI' || '' }} runs-on: ubuntu-latest steps: - name: Checkout pending changes + if: ${{ inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/checkout@v3 with: ref: ${{ inputs.safe-checkout }} - name: Run tests + if: ${{ inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/bazel-docker@v3 with: image: us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:${{ matrix.ruby }}-6.3.0-9848710ff1370795ee7517570a20b81e140112ec