From 4ce04206fcf2c578557b27864386861b682a5977 Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Mon, 25 Sep 2023 13:17:10 -0700 Subject: [PATCH] Update our tests to use a custom checkout action. This will retry up to 3 times if we hit networks flakes updating our submodules. It will also allow us to easily inject other stability fixes to this step in the future. PiperOrigin-RevId: 568306356 --- .github/workflows/staleness_check.yml | 2 +- .github/workflows/test_cpp.yml | 22 +++++++++++----------- .github/workflows/test_csharp.yml | 6 +++--- .github/workflows/test_java.yml | 6 +++--- .github/workflows/test_objectivec.yml | 6 +++--- .github/workflows/test_php.yml | 8 ++++---- .github/workflows/test_php_ext.yml | 2 +- .github/workflows/test_python.yml | 4 ++-- .github/workflows/test_ruby.yml | 10 +++++----- .github/workflows/test_rust.yml | 2 +- .github/workflows/test_upb.yml | 12 ++++++------ 11 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/staleness_check.yml b/.github/workflows/staleness_check.yml index 8b9c7b9fa2..273a4b0117 100644 --- a/.github/workflows/staleness_check.yml +++ b/.github/workflows/staleness_check.yml @@ -26,7 +26,7 @@ jobs: if: ${{ github.event.repository.full_name == 'protocolbuffers/protobuf' }} steps: - name: Checkout ${{ github.head_ref && 'PR' || matrix.branch }} - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 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 41a1c456b6..00f6271113 100644 --- a/.github/workflows/test_cpp.yml +++ b/.github/workflows/test_cpp.yml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Run tests @@ -60,7 +60,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Run tests @@ -80,7 +80,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} submodules: recursive @@ -130,7 +130,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} @@ -155,7 +155,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} submodules: recursive @@ -186,7 +186,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} @@ -226,7 +226,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} submodules: recursive @@ -257,7 +257,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} submodules: recursive @@ -282,7 +282,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} submodules: recursive @@ -331,7 +331,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Run tests @@ -393,7 +393,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} submodules: recursive diff --git a/.github/workflows/test_csharp.yml b/.github/workflows/test_csharp.yml index 21c1aebecd..c4ad4c1e88 100644 --- a/.github/workflows/test_csharp.yml +++ b/.github/workflows/test_csharp.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Run tests @@ -33,7 +33,7 @@ jobs: runs-on: windows-2019 steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} @@ -53,7 +53,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} diff --git a/.github/workflows/test_java.yml b/.github/workflows/test_java.yml index 7bba9e0efe..1824932129 100644 --- a/.github/workflows/test_java.yml +++ b/.github/workflows/test_java.yml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Run tests @@ -54,7 +54,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Run Linkage Monitor test @@ -70,7 +70,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Build protoc diff --git a/.github/workflows/test_objectivec.yml b/.github/workflows/test_objectivec.yml index ae19ec6701..0edd8a4077 100644 --- a/.github/workflows/test_objectivec.yml +++ b/.github/workflows/test_objectivec.yml @@ -34,7 +34,7 @@ jobs: DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} @@ -77,7 +77,7 @@ jobs: DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Pod lib lint @@ -118,7 +118,7 @@ jobs: runs-on: macos-12 steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: bazel ${{ matrix.config.bazel_action }} diff --git a/.github/workflows/test_php.yml b/.github/workflows/test_php.yml index 53422cdce7..003e70e8d4 100644 --- a/.github/workflows/test_php.yml +++ b/.github/workflows/test_php.yml @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Setup composer @@ -77,7 +77,7 @@ jobs: image: us-docker.pkg.dev/protobuf-build/containers/test/linux/32bit@sha256:8275360dc5d676f3470872d79087901c0e4153453976bea908a92c82e8d209ea steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} @@ -114,7 +114,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} @@ -156,7 +156,7 @@ jobs: runs-on: macos-12 steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} diff --git a/.github/workflows/test_php_ext.yml b/.github/workflows/test_php_ext.yml index cb569f123a..fa55ca886c 100644 --- a/.github/workflows/test_php_ext.yml +++ b/.github/workflows/test_php_ext.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} diff --git a/.github/workflows/test_python.yml b/.github/workflows/test_python.yml index 9b33ba07ff..1b6cbd3de6 100644 --- a/.github/workflows/test_python.yml +++ b/.github/workflows/test_python.yml @@ -36,7 +36,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Run tests @@ -66,7 +66,7 @@ jobs: runs-on: macos-12 steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} diff --git a/.github/workflows/test_ruby.yml b/.github/workflows/test_ruby.yml index 1077713fac..4f3707b08a 100644 --- a/.github/workflows/test_ruby.yml +++ b/.github/workflows/test_ruby.yml @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Run tests @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} @@ -81,7 +81,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} @@ -128,7 +128,7 @@ jobs: runs-on: macos-12 steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} @@ -166,7 +166,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Run tests diff --git a/.github/workflows/test_rust.yml b/.github/workflows/test_rust.yml index 7ff12b1bfe..d86acb0a00 100644 --- a/.github/workflows/test_rust.yml +++ b/.github/workflows/test_rust.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Run tests diff --git a/.github/workflows/test_upb.yml b/.github/workflows/test_upb.yml index 31ccb039ca..e02a0b5ced 100644 --- a/.github/workflows/test_upb.yml +++ b/.github/workflows/test_upb.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Run tests @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Run tests @@ -67,7 +67,7 @@ jobs: runs-on: windows-2019 steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Run tests @@ -88,7 +88,7 @@ jobs: runs-on: macos-12 steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Run tests @@ -105,7 +105,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Run tests @@ -126,7 +126,7 @@ jobs: if: ${{ github.event_name != 'pull_request_target' }} steps: - name: Checkout pending changes - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: protocolbuffers/protobuf-ci/checkout@v2 with: ref: ${{ inputs.safe-checkout }} - name: Build Wheels