diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index d4c6330..46692f3 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -39,6 +39,16 @@ jobs: name: stencil-object-files path: src/copapy/obj + - uses: actions/download-artifact@v4 + with: + name: musl-object-files + path: /tmp/musl-object-files + + - name: Add musl copyright notice to license file + run: | + echo "\n\nMUSL COPYRIGHT NOTICE:" >> LICENSE + cat /tmp/musl-object-files/COPYRIGHT >> LICENSE + - name: Set up Python uses: actions/setup-python@v5 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10ac912..9f38a85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/upload-artifact@v4 with: name: musl-object-files - path: /object_files/musl_objects_*.*o + path: /object_files/* build-package-test: needs: [build_stencils] @@ -47,6 +47,16 @@ jobs: name: stencil-object-files path: src/copapy/obj + - uses: actions/download-artifact@v4 + with: + name: musl-object-files + path: /tmp/musl-object-files + + - name: Add musl copyright notice to license file + run: | + echo "\n\nMUSL COPYRIGHT NOTICE:" >> LICENSE + cat /tmp/musl-object-files/COPYRIGHT >> LICENSE + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: @@ -289,7 +299,8 @@ jobs: set -v mkdir -p release cp tmp/stencil-object-files/* release/ - cp tmp/musl-object-files/* release/ + cp tmp/musl-object-files/*.o release/ + cp tmp/musl-object-files/COPYRIGHT release/MUSL-COPYRIGHT.txt cp tmp/runner-linux-x86_64/coparun release/ cp tmp/runner-linux-arm64/coparun release/coparun-aarch64 cp tmp/runner-linux-armv6/coparun release/coparun-armv6 diff --git a/tools/cross_compiler_unix/build_musl.sh b/tools/cross_compiler_unix/build_musl.sh index 48379b8..2f16b1e 100644 --- a/tools/cross_compiler_unix/build_musl.sh +++ b/tools/cross_compiler_unix/build_musl.sh @@ -33,6 +33,8 @@ sh ../packobjs.sh arm-none-eabi-gcc arm-none-eabi-ld /object_files/musl_objects_ #sh ../packobjs.sh riscv64 riscv64-linux-gnu-gcc-13 riscv64-linux-gnu-ld +cp ./COPYRIGHT /object_files/ + echo "- clean up..." rm -r ./* cd ..