Merge pull request #9 from lqiu96/protobuf-check

chore: Update to grpc pre release version
lqiu96 · Nov 20, 2023 · c2bddef · c2bddef
2 parents 8e32af5 + 30f3451
commit c2bddef
Showing 1 changed file with 37 additions and 37 deletions.
diff --git a/.github/workflows/protobuf_check.yaml b/.github/workflows/protobuf_check.yaml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-#        protobuf-ref: [main, 25.x]
+        protobuf-ref: [v25.1]
         googleapis-bazel-target:
           - //google/monitoring/v3:monitoring-v3-nodejs
           - //google/monitoring/v3:monitoring-v3-py
@@ -25,40 +25,40 @@ jobs:
         uses: actions/checkout@v3
         with:
           path: googleapis
-#      - name: Checkout Protobuf with specified Git ref "${{ matrix.protobuf-ref }}"
-#        uses: actions/checkout@v3
-#        with:
-#          repository: 'protocolbuffers/protobuf'
-#          ref: ${{ matrix.protobuf-ref }}
-#          path: protobuf
-#      - name: Checkout gRPC with Protobuf v25
-#        uses: actions/checkout@v3
-#        with:
-#          repository: grpc/grpc
-#          ref: v1.59.1
-#          path: grpc
-#      - name: Show protobuf repository's "git log -1"
-#        working-directory: protobuf
-#        shell: bash
-#        run: |
-#          echo "working directory: $(pwd)"
-#          echo "git log -1:"
-#          git log -1
-#      - name: Show grpc repository's "git log -1"
-#        working-directory: grpc
-#        shell: bash
-#        run: |
-#          echo "working directory: $(pwd)"
-#          echo "git log -1:"
-#          git log -1
-#      - name: Cache Bazel cache
-#        uses: actions/cache@v3
-#        with:
-#          path: |
-#            ~/.cache/bazel
-#          key: ${{ runner.os }}-bazel-${{ hashFiles('grpc/WORKSPACE', 'googleapis/WORKSPACE', 'protobuf/WORKSPACE') }}
-#          restore-keys: |
-#            ${{ runner.os }}-bazel-${{ hashFiles('grpc/WORKSPACE', 'googleapis/WORKSPACE', 'protobuf/WORKSPACE') }}
+      - name: Checkout Protobuf with specified Git ref "${{ matrix.protobuf-ref }}"
+        uses: actions/checkout@v3
+        with:
+          repository: 'protocolbuffers/protobuf'
+          ref: ${{ matrix.protobuf-ref }}
+          path: protobuf
+      - name: Checkout gRPC with Protobuf v25
+        uses: actions/checkout@v3
+        with:
+          repository: grpc/grpc
+          ref: v1.60.0-pre1
+          path: grpc
+      - name: Show protobuf repository's "git log -1"
+        working-directory: protobuf
+        shell: bash
+        run: |
+          echo "working directory: $(pwd)"
+          echo "git log -1:"
+          git log -1
+      - name: Show grpc repository's "git log -1"
+        working-directory: grpc
+        shell: bash
+        run: |
+          echo "working directory: $(pwd)"
+          echo "git log -1:"
+          git log -1
+      - name: Cache Bazel cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/bazel
+          key: ${{ runner.os }}-bazel-${{ hashFiles('grpc/WORKSPACE', 'googleapis/WORKSPACE', 'protobuf/WORKSPACE') }}
+          restore-keys: |
+            ${{ runner.os }}-bazel-${{ hashFiles('grpc/WORKSPACE', 'googleapis/WORKSPACE', 'protobuf/WORKSPACE') }}
       - name: Run code generation bazel build ${{ matrix.googleapis-bazel-target }}
         shell: bash
         run: |
@@ -67,5 +67,5 @@ jobs:
           echo "Running Bazel with ${GITHUB_WORKSPACE}/protobuf"
           cd googleapis && \
             bazelisk build ${{ matrix.googleapis-bazel-target }} --verbose_failures
-#                --override_repository=com_google_protobuf=${GITHUB_WORKSPACE}/protobuf
-#                --override_repository=com_github_grpc_grpc=${GITHUB_WORKSPACE}/grpc
+                --override_repository=com_google_protobuf=${GITHUB_WORKSPACE}/protobuf
+                --override_repository=com_github_grpc_grpc=${GITHUB_WORKSPACE}/grpc