Use composer action for dependency caching.

This will reduce the flakes we've seen in PHP tests. PiperOrigin-RevId: 534226922
2 years ago · 9657172749
parent 03c49f355d
commit 9657172749
11 changed files with 86 additions and 65 deletions
--- a/.github/workflows/test_php.yml
+++ b/.github/workflows/test_php.yml
@ -15,23 +15,29 @@ jobs:
      matrix:
        include:
          - name: 7.3 Debug
+            version-short: "7.3"
            version: 7.3.28-dbg
            command: composer test \&\& composer test_c
          - name: 7.4 Debug
+            version-short: "7.4"
            version: 7.4.18-dbg
            command: composer test \&\& composer test_c
          - name: 8.0 Optimized
-            version: 8.0.5
+            version: "8.0.5"
+            version-short: "8.0"
            command: composer test \&\& composer test_c
          - name: 8.0 Debug
            version: 8.0.5-dbg
+            version-short: "8.0"
            command: composer test \&\& composer test_c
          - name: 8.0 Memory Leak
            version: 8.0.5-dbg
+            version-short: "8.0"
            # Run specialized memory leak & multirequest tests.
            command: composer test_c \&\& tests/multirequest.sh \&\& tests/memory_leak_test.sh
          - name: 8.0 Valgrind
            version: 8.0.5-dbg
+            version-short: "8.0"
            command: composer test_valgrind

    name: Linux ${{ matrix.name}}
@ -41,8 +47,12 @@ jobs:
        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
        with:
          ref: ${{ inputs.safe-checkout }}
-      - name: Update submodules
-        run: git submodule update --init --remote --recursive
+          submodules: recursive
+      - name: Setup composer
+        uses: protocolbuffers/protobuf-ci/composer-setup@v1
+        with:
+          cache-prefix: php-${{ matrix.version-short }}
+          directory: php
      - name: Run tests
        uses: protocolbuffers/protobuf-ci/docker@v1
        with:
@ -75,9 +85,7 @@ jobs:
        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
        with:
          ref: ${{ inputs.safe-checkout }}
-
-      - name: Update submodules
-        run: git submodule update --init --remote --recursive
+          submodules: recursive

      - name: Cross compile protoc for i386
        id: cross-compile
@ -87,6 +95,12 @@ jobs:
          credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
          architecture: linux-i386

+      - name: Setup composer
+        uses: protocolbuffers/protobuf-ci/composer-setup@v1
+        with:
+          cache-prefix: php-${{ matrix.version }}
+          directory: php
+
      - name: Run tests
        uses: protocolbuffers/protobuf-ci/docker@v1
        with:
@ -119,6 +133,12 @@ jobs:
          credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
          architecture: linux-aarch64

+      - name: Setup composer
+        uses: protocolbuffers/protobuf-ci/composer-setup@v1
+        with:
+          cache-prefix: php-7.3
+          directory: php
+
      - name: Run tests
        uses: protocolbuffers/protobuf-ci/docker@v1
        with:
@ -148,11 +168,7 @@ jobs:
        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
        with:
          ref: ${{ inputs.safe-checkout }}
-
-      # Initialize/update the submodule from remote to validate a new fetch based on .gitmodules
-      # We have to do this separately since actions/checkout doesn't support the "--remote" flag
-      - name: Update submodules
-        run: git submodule update --init --remote --recursive
+          submodules: recursive

      - name: Uninstall problematic libgd
        run: brew uninstall --ignore-dependencies gd
@ -164,10 +180,16 @@ jobs:
        uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d # 2.24.0
        with:
          php-version: ${{ matrix.version }}
-      
+
      - name: Check PHP version
        run: php --version | grep ${{ matrix.version }} || (echo "Invalid PHP version - $(php --version)" && exit 1)

+      - name: Setup composer
+        uses: protocolbuffers/protobuf-ci/composer-setup@v1
+        with:
+          cache-prefix: php-${{ matrix.version }}
+          directory: php
+
      - name: Run tests
        uses: protocolbuffers/protobuf-ci/bazel@v1
        with:
@ -175,7 +197,6 @@ jobs:
          bazel-cache: php_macos/${{ matrix.version }}
          bash: |
            pushd php
-            rm -rf vendor
            php -v
            php -m
            composer update
--- a/objectivec/GPBAny.pbobjc.m
+++ b/objectivec/GPBAny.pbobjc.m
@ -91,9 +91,9 @@ typedef struct GPBAny__storage_ {
        "\001\001\004\241!!\000";
    [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
 #endif  // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
--- a/objectivec/GPBApi.pbobjc.m
+++ b/objectivec/GPBApi.pbobjc.m
@ -145,9 +145,9 @@ typedef struct GPBApi__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBApi__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -272,9 +272,9 @@ typedef struct GPBMethod__storage_ {
        "\002\002\007\244\241!!\000\004\010\244\241!!\000";
    [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
 #endif  // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -341,9 +341,9 @@ typedef struct GPBMixin__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBMixin__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
--- a/objectivec/GPBDuration.pbobjc.m
+++ b/objectivec/GPBDuration.pbobjc.m
@ -86,9 +86,9 @@ typedef struct GPBDuration__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBDuration__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
--- a/objectivec/GPBEmpty.pbobjc.m
+++ b/objectivec/GPBEmpty.pbobjc.m
@ -62,9 +62,9 @@ typedef struct GPBEmpty__storage_ {
                                    fieldCount:0
                                   storageSize:sizeof(GPBEmpty__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
--- a/objectivec/GPBFieldMask.pbobjc.m
+++ b/objectivec/GPBFieldMask.pbobjc.m
@ -75,9 +75,9 @@ typedef struct GPBFieldMask__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBFieldMask__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
--- a/objectivec/GPBSourceContext.pbobjc.m
+++ b/objectivec/GPBSourceContext.pbobjc.m
@ -75,9 +75,9 @@ typedef struct GPBSourceContext__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBSourceContext__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
--- a/objectivec/GPBStruct.pbobjc.m
+++ b/objectivec/GPBStruct.pbobjc.m
@ -115,9 +115,9 @@ typedef struct GPBStruct__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBStruct__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -222,9 +222,9 @@ typedef struct GPBValue__storage_ {
    [localDescriptor setupOneofs:oneofs
                           count:(uint32_t)(sizeof(oneofs) / sizeof(char*))
                   firstHasIndex:-1];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -285,9 +285,9 @@ typedef struct GPBListValue__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBListValue__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
--- a/objectivec/GPBTimestamp.pbobjc.m
+++ b/objectivec/GPBTimestamp.pbobjc.m
@ -86,9 +86,9 @@ typedef struct GPBTimestamp__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBTimestamp__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
--- a/objectivec/GPBType.pbobjc.m
+++ b/objectivec/GPBType.pbobjc.m
@ -307,9 +307,9 @@ typedef struct GPBType__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBType__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -468,9 +468,9 @@ typedef struct GPBField__storage_ {
        "\001\006\004\241!!\000";
    [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
 #endif  // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -593,9 +593,9 @@ typedef struct GPBEnum__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBEnum__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -673,9 +673,9 @@ typedef struct GPBEnumValue__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBEnumValue__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -730,9 +730,9 @@ typedef struct GPBOption__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBOption__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
--- a/objectivec/GPBWrappers.pbobjc.m
+++ b/objectivec/GPBWrappers.pbobjc.m
@ -83,9 +83,9 @@ typedef struct GPBDoubleValue__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBDoubleValue__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -129,9 +129,9 @@ typedef struct GPBFloatValue__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBFloatValue__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -175,9 +175,9 @@ typedef struct GPBInt64Value__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBInt64Value__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -221,9 +221,9 @@ typedef struct GPBUInt64Value__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBUInt64Value__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -267,9 +267,9 @@ typedef struct GPBInt32Value__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBInt32Value__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -313,9 +313,9 @@ typedef struct GPBUInt32Value__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBUInt32Value__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -358,9 +358,9 @@ typedef struct GPBBoolValue__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBBoolValue__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -404,9 +404,9 @@ typedef struct GPBStringValue__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBStringValue__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;
@ -450,9 +450,9 @@ typedef struct GPBBytesValue__storage_ {
                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
                                   storageSize:sizeof(GPBBytesValue__storage_)
                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-    #if defined(DEBUG) && DEBUG
+#if defined(DEBUG) && DEBUG
      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
+#endif  // DEBUG
    descriptor = localDescriptor;
  }
  return descriptor;