diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 01357f9..aa9b328 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -7,27 +7,36 @@ jobs: build: strategy: matrix: - os: [windows-latest, macos-latest, ubuntu-16.04] + os: [windows-latest, macos-latest, ubuntu-20.04] runs-on: ${{ matrix.os }} name: Build steps: - uses: actions/checkout@v2.1.0 - uses: actions/setup-node@v1 with: - node-version: 14.x + node-version: 16.x + - run: sudo apt install -y musl musl-tools + if: ${{ matrix.os == 'ubuntu-20.04' }} - run: npm run fetch-libutp - run: npm install - run: npm run prebuild - run: npm run prebuild-ia32 if: ${{ matrix.os == 'windows-latest' }} + - run: npm run prebuild-musl + if: ${{ matrix.os == 'ubuntu-20.04' }} + env: + CC: musl-gcc + CXX: musl-gcc - uses: actions/upload-artifact@v2 with: name: ${{ matrix.os }} path: ./prebuilds release: name: Create Release - runs-on: ubuntu-16.04 + runs-on: ubuntu-latest needs: build + permissions: + contents: write steps: - name: Checkout code uses: actions/checkout@v2 @@ -51,7 +60,7 @@ jobs: - name: Compress builds run: | tar --create --verbose --file="./${{ steps.get_version.outputs.VERSION }}-windows-all.tar" --directory "prebuilds/windows-latest" . - tar --create --verbose --file="./${{ steps.get_version.outputs.VERSION }}-linux-x86.tar" --directory "prebuilds/ubuntu-16.04" . + tar --create --verbose --file="./${{ steps.get_version.outputs.VERSION }}-linux-x86.tar" --directory "prebuilds/ubuntu-20.04" . tar --create --verbose --file="./${{ steps.get_version.outputs.VERSION }}-osx-x86.tar" --directory "prebuilds/macos-latest" . - name: Upload x86 build uses: actions/upload-release-asset@v1 diff --git a/.gitmodules b/.gitmodules index 3da5228..218e15f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "libutp"] path = deps/libutp - url = git://github.com/mafintosh/libutp.git + url = https://github.com/mafintosh/libutp.git diff --git a/package.json b/package.json index cb8edea..512dd70 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,9 @@ "test": "standard && tape test/net.js test/sockets.js test/udp.js", "install": "node-gyp-build", "fetch-libutp": "git submodule update --recursive --init", - "prebuild": "prebuildify --napi --strip", - "prebuild-ia32": "prebuildify --napi --strip --arch=ia32" + "prebuild": "prebuildify --napi --strip --tag-libc", + "prebuild-musl": "prebuildify --napi --strip --libc=musl --tag-libc", + "prebuild-ia32": "prebuildify --napi --strip --arch=ia32 --tag-libc" }, "bin": { "ucat": "./ucat.js" @@ -28,7 +29,8 @@ "devDependencies": { "prebuildify": "^4.1.2", "standard": "^14.3.1", - "tape": "^4.11.0" + "tape": "^4.11.0", + "node-gyp": "^10.1.0" }, "repository": { "type": "git",