diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a68e7ec..efff09d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -34,7 +34,7 @@ on: env: DISTRO: ${{ inputs.distro || 'alpine' }} - ARCH: ${{ inputs.arch || 'aarch64' }} + ARCH: ${{ inputs.arch || 'armv6hf' }} NODE_VERSION: ${{ inputs.node-version || '19.6.1' }} BUCKET_NAME: ${{ vars.BUCKET_NAME || 'resin-packages' }} @@ -90,9 +90,18 @@ jobs: steps: # https://github.com/actions/checkout - - name: Checkout + - name: Checkout node-arm uses: actions/checkout@v4.1.1 + # https://github.com/actions/checkout + - name: Checkout nodejs/node + uses: actions/checkout@v4.1.1 + with: + repository: nodejs/node + ref: v${{ env.NODE_VERSION }} + fetch-depth: 1 + path: node + # https://github.com/aws-actions/configure-aws-credentials - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 diff --git a/Dockerfile b/Dockerfile index 047deb1..b1d278c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV BUILD_FLAGS='--prefix=/' ENV DEST_DIR=node-v${NODE_VERSION}-linux-${BALENA_ARCH} ENV TAR_FILE=node-v${NODE_VERSION}-linux-${BALENA_ARCH}.tar.gz -FROM balenalib/${BALENALIB_ARCH}-alpine:3.18-build AS alpine +FROM balenalib/${BALENALIB_ARCH}-alpine:3.14-build AS alpine ARG BALENA_ARCH=%%BALENA_ARCH%% ENV BUILD_FLAGS='--prefix=/ --shared-zlib' @@ -21,10 +21,10 @@ FROM ${DISTRO} AS build WORKDIR /src -RUN git clone https://github.com/nodejs/node.git . +COPY node/ ./ +COPY commit-table ./commit-table ARG NODE_VERSION -COPY commit-table ./commit-table RUN commit="$(awk -v version="v${NODE_VERSION}" '$2 == version {print $1}' commit-table)" && \ if [ -z "${commit}" ]; then echo "commit for v$NODE_VERSION not found!" ; exit 1 ; fi && \