diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 166234a5..58a740c1 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -2,6 +2,9 @@ name: macOS-Android on: push: + branches: + - main + pull_request: env: DEBUG: 'napi:*' diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 9b3468f4..04c59605 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -25,10 +25,18 @@ jobs: username: ${{ secrets.GH_CONTAINER_UNAME }} password: ${{ secrets.GH_TOKEN }} - - name: Build and push + - name: Build and push alpine uses: docker/build-push-action@v2 with: file: alpine.Dockerfile platforms: linux/amd64,linux/arm64 push: true tags: ghcr.io/${{ github.repository }}/nodejs-rust:lts-alpine + + - name: Build and push debian + uses: docker/build-push-action@v2 + with: + file: debian.Dockerfile + platforms: linux/amd64,linux/arm64 + push: true + tags: ghcr.io/${{ github.repository }}/nodejs-rust:lts-debian diff --git a/.github/workflows/linux-musl.yaml b/.github/workflows/linux-musl.yaml index 774f83ca..7d566644 100644 --- a/.github/workflows/linux-musl.yaml +++ b/.github/workflows/linux-musl.yaml @@ -32,10 +32,10 @@ jobs: - name: Pull docker image run: | docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL - docker pull docker.pkg.github.com/napi-rs/napi-rs/nodejs-rust:lts-alpine - docker tag docker.pkg.github.com/napi-rs/napi-rs/nodejs-rust:lts-alpine builder + docker pull $DOCKER_REGISTRY_URL/${{ github.repository }}/nodejs-rust:lts-alpine + docker tag $DOCKER_REGISTRY_URL/${{ github.repository }}/nodejs-rust:lts-alpine builder env: - DOCKER_REGISTRY_URL: docker.pkg.github.com + DOCKER_REGISTRY_URL: ghcr.io DOCKER_USERNAME: ${{ github.actor }} DOCKER_PASSWORD: ${{ secrets.GITHUB_TOKEN }} diff --git a/debian.Dockerfile b/debian.Dockerfile new file mode 100644 index 00000000..0f7a949a --- /dev/null +++ b/debian.Dockerfile @@ -0,0 +1,16 @@ +FROM node:lts + +ENV RUSTUP_HOME=/usr/local/rustup \ + CARGO_HOME=/usr/local/cargo \ + PATH=/usr/local/cargo/bin:$PATH + +RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \ + echo "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch main" >> /etc/apt/sources.list && \ + echo "deb-src http://apt.llvm.org/stretch/ llvm-toolchain-stretch main" >> /etc/apt/sources.list && \ + apt-get update && \ + apt-get install -y --fix-missing \ + llvm \ + clang \ + rcs \ + ninja-build && \ + curl https://sh.rustup.rs -sSf | sh -s -- -y