diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a012181317..7d262dff11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -142,7 +142,7 @@ jobs: - run: ccache -s - run: ../tests/basic.sh out/Release/naive - run: mkdir ${{ env.BUNDLE }} && cp out/Release/naive config.json ../LICENSE ../USAGE.txt ${{ env.BUNDLE }} - - run: cp out/Release/libcronet* components/cronet/native/generated/cronet.idl_c.h components/cronet/native/include/*.h components/grpc_support/include/*.h components/cronet/native/sample/bidi_example.cc ${{ env.BUNDLE }} + - run: cp out/Release/libcronet* out/Release/obj/components/cronet/libcronet_static* components/cronet/native/generated/cronet.idl_c.h components/cronet/native/include/*.h components/grpc_support/include/*.h components/cronet/native/sample/bidi_example.cc ${{ env.BUNDLE }} - run: tar cJf ../${{ env.BUNDLE }}.tar.xz ${{ env.BUNDLE }} - uses: actions/upload-release-asset@v1 if: ${{ github.event_name == 'release' }} @@ -213,7 +213,7 @@ jobs: # qemu-user segfaults with x64 or x86 android builds here. if: ${{ matrix.arch != 'x64' && matrix.arch != 'x86' }} - run: mkdir ${{ env.BUNDLE }} && cp out/Release/naive config.json ../LICENSE ../USAGE.txt ${{ env.BUNDLE }} - - run: cp out/Release/libcronet* components/cronet/native/generated/cronet.idl_c.h components/cronet/native/include/*.h components/grpc_support/include/*.h components/cronet/native/sample/bidi_example.cc ${{ env.BUNDLE }} + - run: cp out/Release/libcronet* out/Release/obj/components/cronet/libcronet_static* components/cronet/native/generated/cronet.idl_c.h components/cronet/native/include/*.h components/grpc_support/include/*.h components/cronet/native/sample/bidi_example.cc ${{ env.BUNDLE }} - run: tar cJf ../${{ env.BUNDLE }}.tar.xz ${{ env.BUNDLE }} - uses: actions/upload-release-asset@v1 if: ${{ github.event_name == 'release' }} @@ -279,7 +279,7 @@ jobs: # No real or emulated environment is available to test this. if: ${{ matrix.arch != 'arm64' }} - run: mkdir ${{ env.BUNDLE }} && cp out/Release/naive.exe config.json ../LICENSE ../USAGE.txt ${{ env.BUNDLE }} - - run: cp out/Release/cronet* components/cronet/native/generated/cronet.idl_c.h components/cronet/native/include/*.h components/grpc_support/include/*.h components/cronet/native/sample/bidi_example.cc ${{ env.BUNDLE }} + - run: cp out/Release/cronet* out/Release/obj/components/cronet/cronet_static* components/cronet/native/generated/cronet.idl_c.h components/cronet/native/include/*.h components/grpc_support/include/*.h components/cronet/native/sample/bidi_example.cc ${{ env.BUNDLE }} - run: 7z a ../${{ env.BUNDLE }}.zip ${{ env.BUNDLE }} - uses: actions/upload-release-asset@v1 if: ${{ github.event_name == 'release' }} @@ -334,7 +334,7 @@ jobs: # No real or emulated environment is available to test this. if: ${{ matrix.arch != 'arm64' }} - run: mkdir ${{ env.BUNDLE }} && cp out/Release/naive config.json ../LICENSE ../USAGE.txt ${{ env.BUNDLE }} - - run: cp -r out/Release/libcronet* components/cronet/native/generated/cronet.idl_c.h components/cronet/native/include/*.h components/grpc_support/include/*.h components/cronet/native/sample/bidi_example.cc ${{ env.BUNDLE }} + - run: cp -r out/Release/libcronet* out/Release/obj/components/cronet/libcronet_static* components/cronet/native/generated/cronet.idl_c.h components/cronet/native/include/*.h components/grpc_support/include/*.h components/cronet/native/sample/bidi_example.cc ${{ env.BUNDLE }} - run: tar cJf ../${{ env.BUNDLE }}.tar.xz ${{ env.BUNDLE }} - uses: actions/upload-release-asset@v1 if: ${{ github.event_name == 'release' }} @@ -488,7 +488,7 @@ jobs: - run: ccache -s - run: ../tests/basic.sh out/Release/naive - run: mkdir ${{ env.BUNDLE }} && cp out/Release/naive config.json ../LICENSE ../USAGE.txt ${{ env.BUNDLE }} - - run: cp out/Release/libcronet* components/cronet/native/generated/cronet.idl_c.h components/cronet/native/include/*.h components/grpc_support/include/*.h components/cronet/native/sample/bidi_example.cc ${{ env.BUNDLE }} + - run: cp out/Release/libcronet* out/Release/obj/components/cronet/libcronet_static* components/cronet/native/generated/cronet.idl_c.h components/cronet/native/include/*.h components/grpc_support/include/*.h components/cronet/native/sample/bidi_example.cc ${{ env.BUNDLE }} if: ${{ ! contains(matrix.extra, 'build_static=true') }} - run: tar cJf ../${{ env.BUNDLE }}.tar.xz ${{ env.BUNDLE }} - uses: actions/upload-release-asset@v1