|
|
@@ -47,7 +47,7 @@ jobs:
|
|
|
- name: Checkout
|
|
|
uses: actions/checkout@v4
|
|
|
with:
|
|
|
- path: main
|
|
|
+ path: swift-protobuf
|
|
|
- name: Update and install dependencies
|
|
|
# dependencies from https://github.com/protocolbuffers/protobuf/blob/main/src/README.md
|
|
|
# this step is run before get-sha because we need curl and jq for get-sha
|
|
|
@@ -71,7 +71,7 @@ jobs:
|
|
|
with:
|
|
|
path: protobuf
|
|
|
# NOTE: for refs that can float like 'main' the cache might be out of date!
|
|
|
- key: ${{ runner.os }}-${{ matrix.swift}}-protobuf-${{ steps.get-sha.outputs.sha }}
|
|
|
+ key: ${{ runner.os }}-${{ matrix.swift }}-protobuf-${{ steps.get-sha.outputs.sha }}
|
|
|
- name: Checkout protobuf repo
|
|
|
if: steps.cache-protobuf.outputs.cache-hit != 'true'
|
|
|
uses: actions/checkout@v4
|
|
|
@@ -95,5 +95,5 @@ jobs:
|
|
|
NUM_CPUS=$(getconf _NPROCESSORS_ONLN)
|
|
|
make -j "${NUM_CPUS}" protoc conformance_test_runner
|
|
|
- name: Test conformance
|
|
|
- working-directory: main
|
|
|
+ working-directory: swift-protobuf
|
|
|
run: make test-conformance CONFORMANCE_TEST_RUNNER=../protobuf/cmake_build/conformance_test_runner
|