From ae5f843be96f2a55c702d928b569bca6cb157e9c Mon Sep 17 00:00:00 2001 From: Daniel Lando Date: Thu, 1 Feb 2024 17:06:52 +0100 Subject: [PATCH 01/14] fix: tar extract issue --- .github/workflows/build-linux.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index e8f3a852..27976ab2 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -27,11 +27,11 @@ jobs: context: . file: ./Dockerfile.linux platforms: linux/amd64 - outputs: type=tar,dest=../out.tar + outputs: type=tar,dest=./out.tar - name: Extract binaries from Docker image run: | - tar xvf ../out.tar root/pkg-fetch/dist + tar xvf ./out.tar root/pkg-fetch/dist - name: Check if binary is compiled id: check_file @@ -68,11 +68,11 @@ jobs: context: . file: ./Dockerfile.linuxcross platforms: linux/amd64 - outputs: type=tar,dest=../out.tar + outputs: type=tar,dest=./out.tar - name: Extract binaries from Docker image run: | - tar xvf ../out.tar root/pkg-fetch/dist + tar xvf ./out.tar root/pkg-fetch/dist - name: Check if binary is compiled id: check_file From 9a935bbecbf28cb138721540382163ee4414183c Mon Sep 17 00:00:00 2001 From: Daniel Lando Date: Thu, 1 Feb 2024 17:33:45 +0100 Subject: [PATCH 02/14] fix: try export local --- .github/workflows/build-linux.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 27976ab2..d886d3d2 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -27,11 +27,13 @@ jobs: context: . file: ./Dockerfile.linux platforms: linux/amd64 - outputs: type=tar,dest=./out.tar + outputs: type=local,dest=../out - name: Extract binaries from Docker image run: | - tar xvf ./out.tar root/pkg-fetch/dist + mkdir -p root/pkg-fetch/dist + ls -l ../out + mv ../out/* root/pkg-fetch/dist - name: Check if binary is compiled id: check_file @@ -68,11 +70,11 @@ jobs: context: . file: ./Dockerfile.linuxcross platforms: linux/amd64 - outputs: type=tar,dest=./out.tar + outputs: type=local,dest=../out - name: Extract binaries from Docker image run: | - tar xvf ./out.tar root/pkg-fetch/dist + tar xvf ../out.tar root/pkg-fetch/dist - name: Check if binary is compiled id: check_file From 2ecf0ef5b05d6a3cfcf4f642a16493865e0ff04d Mon Sep 17 00:00:00 2001 From: Daniel Lando Date: Thu, 1 Feb 2024 17:40:14 +0100 Subject: [PATCH 03/14] fix: change target dir --- .github/workflows/build-linux.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index d886d3d2..b2d3cdad 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -27,13 +27,13 @@ jobs: context: . file: ./Dockerfile.linux platforms: linux/amd64 - outputs: type=local,dest=../out + outputs: type=local,dest=./out - name: Extract binaries from Docker image run: | mkdir -p root/pkg-fetch/dist - ls -l ../out - mv ../out/* root/pkg-fetch/dist + ls -l ./out + mv ./out/* root/pkg-fetch/dist - name: Check if binary is compiled id: check_file @@ -70,11 +70,13 @@ jobs: context: . file: ./Dockerfile.linuxcross platforms: linux/amd64 - outputs: type=local,dest=../out + outputs: type=local,dest=./out - name: Extract binaries from Docker image run: | - tar xvf ../out.tar root/pkg-fetch/dist + mkdir -p root/pkg-fetch/dist + ls -l ./out + mv ./out/* root/pkg-fetch/dist - name: Check if binary is compiled id: check_file From d83a700bc892f5c957b5ef2a28b6b24d0ce64e81 Mon Sep 17 00:00:00 2001 From: Daniel Lando Date: Thu, 1 Feb 2024 17:48:39 +0100 Subject: [PATCH 04/14] fix: nodejs install --- Dockerfile.linux | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.linux b/Dockerfile.linux index 0c2407fe..8c4c2805 100644 --- a/Dockerfile.linux +++ b/Dockerfile.linux @@ -13,8 +13,8 @@ RUN yum install -y \ make patch python2 \ rh-python36-python -RUN curl -fsSL https://rpm.nodesource.com/setup_16.x | bash - -RUN yum install -y nodejs +RUN curl -L https://rpm.nodesource.com/nsolid_setup_rpm.sh | bash -s -- 18 +RUN yum install nodejs -y --setopt=nodesource-nodejs.module_hotfixes=1 RUN npm install -g yarn COPY . ./ From 568d9209d4493b26545414c3e84676cae92258db Mon Sep 17 00:00:00 2001 From: Daniel Lando Date: Thu, 1 Feb 2024 17:56:48 +0100 Subject: [PATCH 05/14] fix: use docker image --- .github/workflows/build-linux.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index b2d3cdad..6e338b18 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -20,6 +20,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build + id: build uses: docker/build-push-action@v5 with: build-args: | @@ -27,24 +28,24 @@ jobs: context: . file: ./Dockerfile.linux platforms: linux/amd64 - outputs: type=local,dest=./out + outputs: type=docker - name: Extract binaries from Docker image run: | - mkdir -p root/pkg-fetch/dist - ls -l ./out - mv ./out/* root/pkg-fetch/dist + mkdir -p dist + CONTAINER_ID=$(docker create ${{ steps.build.outputs.imageid }}) + docker cp $CONTAINER_ID:/root/pkg-fetch/dist ./dist - name: Check if binary is compiled id: check_file run: | - (test -f root/pkg-fetch/dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT + (test -f ./dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT - uses: actions/upload-artifact@v4 if: steps.check_file.outputs.EXISTS == 'true' with: name: node${{ matrix.target-node }}-linux-x64 - path: root/pkg-fetch/dist/* + path: ./dist/* linux-arm64: runs-on: ubuntu-20.04 @@ -61,6 +62,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build + id: build uses: docker/build-push-action@v5 with: build-args: | @@ -70,21 +72,21 @@ jobs: context: . file: ./Dockerfile.linuxcross platforms: linux/amd64 - outputs: type=local,dest=./out + outputs: type=docker - name: Extract binaries from Docker image run: | - mkdir -p root/pkg-fetch/dist - ls -l ./out - mv ./out/* root/pkg-fetch/dist + mkdir -p dist + CONTAINER_ID=$(docker create ${{ steps.build.outputs.imageid }}) + docker cp $CONTAINER_ID:/root/pkg-fetch/dist ./dist - name: Check if binary is compiled id: check_file run: | - (test -f root/pkg-fetch/dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT + (test -f ./dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT - uses: actions/upload-artifact@v4 if: steps.check_file.outputs.EXISTS == 'true' with: name: node${{ matrix.target-node }}-linux-arm64 - path: root/pkg-fetch/dist/* + path: ./dist/* From 43f0578ff822edaaf79cd4d4b1f31ac0dfaa7a66 Mon Sep 17 00:00:00 2001 From: Daniel Lando Date: Thu, 1 Feb 2024 18:00:13 +0100 Subject: [PATCH 06/14] fix: revert nodejs install --- Dockerfile.linux | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.linux b/Dockerfile.linux index 8c4c2805..0c2407fe 100644 --- a/Dockerfile.linux +++ b/Dockerfile.linux @@ -13,8 +13,8 @@ RUN yum install -y \ make patch python2 \ rh-python36-python -RUN curl -L https://rpm.nodesource.com/nsolid_setup_rpm.sh | bash -s -- 18 -RUN yum install nodejs -y --setopt=nodesource-nodejs.module_hotfixes=1 +RUN curl -fsSL https://rpm.nodesource.com/setup_16.x | bash - +RUN yum install -y nodejs RUN npm install -g yarn COPY . ./ From 11162318615f3b2ad1a2866c4cfe7ababfc4e154 Mon Sep 17 00:00:00 2001 From: Daniel Lando Date: Fri, 2 Feb 2024 08:29:24 +0100 Subject: [PATCH 07/14] fix: use local exporter --- .github/workflows/build-linux.yml | 24 ++++++------------------ Dockerfile.linux | 5 ++++- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 6e338b18..4c394438 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -28,24 +28,18 @@ jobs: context: . file: ./Dockerfile.linux platforms: linux/amd64 - outputs: type=docker - - - name: Extract binaries from Docker image - run: | - mkdir -p dist - CONTAINER_ID=$(docker create ${{ steps.build.outputs.imageid }}) - docker cp $CONTAINER_ID:/root/pkg-fetch/dist ./dist + outputs: type=local, dest=dist - name: Check if binary is compiled id: check_file run: | - (test -f ./dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT + (test -f dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT - uses: actions/upload-artifact@v4 if: steps.check_file.outputs.EXISTS == 'true' with: name: node${{ matrix.target-node }}-linux-x64 - path: ./dist/* + path: dist/* linux-arm64: runs-on: ubuntu-20.04 @@ -72,21 +66,15 @@ jobs: context: . file: ./Dockerfile.linuxcross platforms: linux/amd64 - outputs: type=docker - - - name: Extract binaries from Docker image - run: | - mkdir -p dist - CONTAINER_ID=$(docker create ${{ steps.build.outputs.imageid }}) - docker cp $CONTAINER_ID:/root/pkg-fetch/dist ./dist + outputs: type=local, dest=dist - name: Check if binary is compiled id: check_file run: | - (test -f ./dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT + (test -f dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT - uses: actions/upload-artifact@v4 if: steps.check_file.outputs.EXISTS == 'true' with: name: node${{ matrix.target-node }}-linux-arm64 - path: ./dist/* + path: dist/* diff --git a/Dockerfile.linux b/Dockerfile.linux index 0c2407fe..6fde1b6a 100644 --- a/Dockerfile.linux +++ b/Dockerfile.linux @@ -1,4 +1,4 @@ -FROM oraclelinux:7 +FROM oraclelinux:7 AS build USER root:root WORKDIR /root/pkg-fetch/ @@ -27,3 +27,6 @@ RUN scl enable devtoolset-10 rh-python36 \ " \ yarn start --node-range $PKG_FETCH_OPTION_n --output dist \ " + +FROM scratch +COPY --from=build /root/pkg-fetch/dist / From a7aa3468cb48d1dea190937334ab20cda1367ac1 Mon Sep 17 00:00:00 2001 From: Daniel Lando Date: Fri, 2 Feb 2024 08:49:42 +0100 Subject: [PATCH 08/14] fix: add ls --- .github/workflows/build-linux.yml | 2 ++ Dockerfile.linuxcross | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 4c394438..3999524e 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -33,6 +33,7 @@ jobs: - name: Check if binary is compiled id: check_file run: | + ls -l dist (test -f dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT - uses: actions/upload-artifact@v4 @@ -71,6 +72,7 @@ jobs: - name: Check if binary is compiled id: check_file run: | + ls -l dist (test -f dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT - uses: actions/upload-artifact@v4 diff --git a/Dockerfile.linuxcross b/Dockerfile.linuxcross index 1443639c..bc5123fa 100644 --- a/Dockerfile.linuxcross +++ b/Dockerfile.linuxcross @@ -1,4 +1,4 @@ -FROM ubuntu:bionic +FROM ubuntu:bionic AS build USER root:root WORKDIR /root/pkg-fetch/ @@ -40,3 +40,6 @@ ARG PKG_FETCH_OPTION_a ARG PKG_FETCH_OPTION_n RUN yarn start --arch $PKG_FETCH_OPTION_a --node-range $PKG_FETCH_OPTION_n --output dist + +FROM scratch +COPY --from=build /root/pkg-fetch/dist / From c769d694b532192022c990edb36114c16baece96 Mon Sep 17 00:00:00 2001 From: Daniel Lando Date: Fri, 2 Feb 2024 09:02:27 +0100 Subject: [PATCH 09/14] fix: nodejs install --- Dockerfile.linuxcross | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile.linuxcross b/Dockerfile.linuxcross index bc5123fa..6fa272ba 100644 --- a/Dockerfile.linuxcross +++ b/Dockerfile.linuxcross @@ -5,9 +5,13 @@ WORKDIR /root/pkg-fetch/ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -RUN apt-get install -y curl software-properties-common -RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - -RUN apt-get install -y nodejs +RUN apt-get install -y curl software-properties-common ca-certificates gnupg + +# Install Node.js +ENV NODE_MAJOR=18 +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \ + echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list && \ + sudo apt-get update && sudo apt-get install nodejs -y RUN apt-get install -y binutils g++-8 git make patch python3 python3-distutils From 7ebdfbd4e46ca78316283389b94e775f2d09d687 Mon Sep 17 00:00:00 2001 From: Daniel Lando Date: Fri, 2 Feb 2024 09:03:07 +0100 Subject: [PATCH 10/14] fix: remove sudo --- Dockerfile.linuxcross | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.linuxcross b/Dockerfile.linuxcross index 6fa272ba..410b7ac6 100644 --- a/Dockerfile.linuxcross +++ b/Dockerfile.linuxcross @@ -9,9 +9,9 @@ RUN apt-get install -y curl software-properties-common ca-certificates gnupg # Install Node.js ENV NODE_MAJOR=18 -RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \ - echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list && \ - sudo apt-get update && sudo apt-get install nodejs -y +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \ + echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \ + apt-get update && apt-get install nodejs -y RUN apt-get install -y binutils g++-8 git make patch python3 python3-distutils From 7c9ce1c66528ea7438499e98b147b03bc6483bbf Mon Sep 17 00:00:00 2001 From: Daniel Lando Date: Fri, 2 Feb 2024 09:12:34 +0100 Subject: [PATCH 11/14] fix: change all workflows to use local export --- .github/workflows/build-alpine.yml | 13 +++++-------- .github/workflows/build-linux.yml | 4 ++-- .github/workflows/build-linuxstatic.yml | 13 +++++-------- .github/workflows/build-macos.yml | 3 ++- .github/workflows/build-windows.yml | 2 +- Dockerfile.alpine | 5 ++++- 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-alpine.yml b/.github/workflows/build-alpine.yml index 516807dc..8be1f20f 100644 --- a/.github/workflows/build-alpine.yml +++ b/.github/workflows/build-alpine.yml @@ -39,19 +39,16 @@ jobs: context: . file: ./Dockerfile.alpine platforms: linux/amd64 - outputs: type=tar,dest=../out.tar + outputs: type=local, dest=dist - - name: Extract binaries from Docker image - run: | - tar xvf ../out.tar root/pkg-fetch/dist - - - name: Check if binary is compiled + - name: Check if binary is compiled, skip if download only id: check_file run: | - (test -f root/pkg-fetch/dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT + ls -l dist + (test -f dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT - uses: actions/upload-artifact@v4 if: steps.check_file.outputs.EXISTS == 'true' with: name: node${{ matrix.target-node }}-alpine-${{ matrix.target-arch }} - path: root/pkg-fetch/dist/* + path: dist/* diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 3999524e..19afc1d3 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -30,7 +30,7 @@ jobs: platforms: linux/amd64 outputs: type=local, dest=dist - - name: Check if binary is compiled + - name: Check if binary is compiled, skip if download only id: check_file run: | ls -l dist @@ -69,7 +69,7 @@ jobs: platforms: linux/amd64 outputs: type=local, dest=dist - - name: Check if binary is compiled + - name: Check if binary is compiled, skip if download only id: check_file run: | ls -l dist diff --git a/.github/workflows/build-linuxstatic.yml b/.github/workflows/build-linuxstatic.yml index 7c8721f5..dee5c396 100644 --- a/.github/workflows/build-linuxstatic.yml +++ b/.github/workflows/build-linuxstatic.yml @@ -42,19 +42,16 @@ jobs: context: . file: ./Dockerfile.alpine platforms: linux/amd64 - outputs: type=tar,dest=../out.tar + outputs: type=local, dest=dist - - name: Extract binaries from Docker image - run: | - tar xvf ../out.tar root/pkg-fetch/dist - - - name: Check if binary is compiled + - name: Check if binary is compiled, skip if download only id: check_file run: | - (test -f root/pkg-fetch/dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT + ln -l dist + (test -f dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT - uses: actions/upload-artifact@v4 if: steps.check_file.outputs.EXISTS == 'true' with: name: node${{ matrix.target-node }}-linuxstatic-${{ matrix.target-arch }} - path: root/pkg-fetch/dist/* + path: dist/* diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index f7f3e366..95195493 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -29,9 +29,10 @@ jobs: - run: yarn start --node-range node${{ matrix.target-node }} --output dist - - name: Check if binary is compiled + - name: Check if binary is compiled, skip if download only id: check_file run: | + ln -l dist (test -f dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT - uses: actions/upload-artifact@v3 diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index a5e95da8..a29ca914 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -28,7 +28,7 @@ jobs: - run: yarn start --node-range node${{ matrix.target-node }} --arch ${{ matrix.target-arch }} --output dist - - name: Check if binary is compiled + - name: Check if binary is compiled, skip if download only id: check_file run: | if (Test-Path -Path dist\\*.sha256sum -PathType Leaf) { echo ""EXISTS=true" >> $GITHUB_OUTPUT" } else { echo ""EXISTS=false" >> $GITHUB_OUTPUT" } diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 1c423ae1..0c40f37c 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,7 +1,7 @@ ARG HOST_ARCH=x86_64 ARG TARGET_TRIPLE=aarch64-linux-musl -FROM muslcc/$HOST_ARCH:$TARGET_TRIPLE +FROM muslcc/$HOST_ARCH:$TARGET_TRIPLE AS build ARG PKG_FETCH_OPTION_a ARG PKG_FETCH_OPTION_n @@ -37,3 +37,6 @@ COPY . ./ RUN yarn install --ignore-engines RUN yarn start --arch $PKG_FETCH_OPTION_a --node-range $PKG_FETCH_OPTION_n --platform $PKG_FETCH_OPTION_p --output dist + +FROM scratch +COPY --from=build /root/pkg-fetch/dist / From c453b34bd48e23a1c632bdec8c4c086f2df410dc Mon Sep 17 00:00:00 2001 From: Daniel Lando Date: Fri, 2 Feb 2024 09:14:22 +0100 Subject: [PATCH 12/14] fix: typo --- .github/workflows/build-linuxstatic.yml | 2 +- .github/workflows/build-macos.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-linuxstatic.yml b/.github/workflows/build-linuxstatic.yml index dee5c396..2b50d1a8 100644 --- a/.github/workflows/build-linuxstatic.yml +++ b/.github/workflows/build-linuxstatic.yml @@ -47,7 +47,7 @@ jobs: - name: Check if binary is compiled, skip if download only id: check_file run: | - ln -l dist + ls -l dist (test -f dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT - uses: actions/upload-artifact@v4 diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 95195493..32e9d715 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -32,7 +32,7 @@ jobs: - name: Check if binary is compiled, skip if download only id: check_file run: | - ln -l dist + ls -l dist (test -f dist/*.sha256sum && echo "EXISTS=true" >> $GITHUB_OUTPUT) || echo "EXISTS=false" >> $GITHUB_OUTPUT - uses: actions/upload-artifact@v3 From ef0b243a35e1d2ff5a380e6f920262ac9b48d816 Mon Sep 17 00:00:00 2001 From: Daniel Lando Date: Fri, 2 Feb 2024 09:28:26 +0100 Subject: [PATCH 13/14] fix: nodejs 16 --- Dockerfile.linuxcross | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile.linuxcross b/Dockerfile.linuxcross index 410b7ac6..8b2331fd 100644 --- a/Dockerfile.linuxcross +++ b/Dockerfile.linuxcross @@ -8,10 +8,8 @@ RUN apt-get update RUN apt-get install -y curl software-properties-common ca-certificates gnupg # Install Node.js -ENV NODE_MAJOR=18 -RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \ - echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \ - apt-get update && apt-get install nodejs -y +RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \ + apt-get install -y nodejs RUN apt-get install -y binutils g++-8 git make patch python3 python3-distutils From 2cbd862b218940d3a8f3dce009c73305f9c7ac22 Mon Sep 17 00:00:00 2001 From: Daniel Lando Date: Fri, 2 Feb 2024 10:42:59 +0100 Subject: [PATCH 14/14] fix: revert branch protection cflag on node 18 --- patches/node.v18.19.0.cpp.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/node.v18.19.0.cpp.patch b/patches/node.v18.19.0.cpp.patch index d2dd0a78..7eecccd7 100644 --- a/patches/node.v18.19.0.cpp.patch +++ b/patches/node.v18.19.0.cpp.patch @@ -413,7 +413,7 @@ index 08cb3f38e8..6c0d2761ab 100644 'conditions': [ + ['target_arch=="arm64"', { -+ 'cflags': ['-mbranch-protection=standard'], # Pointer authentication. ++ 'cflags': ['-msign-return-address=all'], # Pointer authentication. + }], ['OS in "aix os400"', { 'ldflags': [