Merge remote-tracking branch 'origin/disable-upload-artifacts-action' into disable-upload-artifacts-action
# Conflicts:
# .github/workflows/test_ruby.yml
diff --git a/.github/workflows/test_ruby.yml b/.github/workflows/test_ruby.yml
index ea36fb2..8d75418 100644
--- a/.github/workflows/test_ruby.yml
+++ b/.github/workflows/test_ruby.yml
@@ -42,7 +42,7 @@
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: ruby_linux/${{ matrix.ruby }}_${{ matrix.bazel }}
bazel: test //ruby/... //ruby/tests:ruby_version --test_env=KOKORO_RUBY_VERSION --test_env=BAZEL=true ${{ matrix.ffi == 'FFI' && '--//ruby:ffi=enabled --test_env=PROTOCOL_BUFFERS_RUBY_IMPLEMENTATION=FFI' || '' }}
-# A useful tool for troubleshooting, but the action introduces flakes as well
+# Useful tool for troubleshooting, but the action introduces flakes as well,
# e.g. https://github.com/actions/upload-artifact/issues/569
# - name: Archive log artifacts
# uses: actions/upload-artifact@v4
