ci: protoc for macos-14, version in pact-protobuf-plugin doesnt suppo…

…rt macos arm64, paths for windows
YOU54F · Feb 24, 2024 · 921285a · 921285a
1 parent a4e9c2e
commit 921285a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -112,6 +112,10 @@ jobs:
         with:
           node-version: ${{ env.NODE_VERSION }}
 
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v2
+        if: matrix.os == 'macos-14'
+
       - if: runner.os == 'Windows'
         run: echo "ONLY_DOWNLOAD_PACT_FOR_WINDOWS=true" >> $GITHUB_ENV
 

diff --git a/test/message.integration.spec.ts b/test/message.integration.spec.ts
@@ -147,7 +147,12 @@ describe('FFI integration test for the Message Consumer API', () => {
     });
 
     describe('with plugin contents (gRPC)', () => {
-      const protoFile = `${__dirname}/integration/grpc/route_guide.proto`;
+      const protoFile = path.join(
+        __dirname,
+        'integration',
+        'grpc',
+        'route_guide.proto'
+      );
 
       let port: number;
 

diff --git a/test/plugin-verifier.integration.spec.ts b/test/plugin-verifier.integration.spec.ts
@@ -4,6 +4,7 @@ import { loadSync } from '@grpc/proto-loader';
 import * as grpc from '@grpc/grpc-js';
 import express = require('express');
 import * as http from 'http';
+import path = require('path');
 import cors = require('cors');
 import bodyParser = require('body-parser');
 import { returnJson } from './integration/data-utils';
@@ -118,14 +119,21 @@ describe('Plugin Verifier Integration Spec', () => {
             },
           ],
           logLevel: 'debug',
-          pactUrls: [`${__dirname}/integration/grpc/grpc.json`],
+          pactUrls: [
+            path.join(__dirname, 'integration', 'grpc', 'route_guide.proto'),
+          ],
         }).verify();
 
         expect('').to.eq('');
       });
 
       it('runs the grpc client', async () => {
-        const protoFile = `${__dirname}/integration/grpc/route_guide.proto`;
+        const protoFile = path.join(
+          __dirname,
+          'integration',
+          'grpc',
+          'route_guide.proto'
+        );
         const feature = await getFeature(`127.0.0.1:${GRPC_PORT}`, protoFile);
 
         console.log(feature);