actions
/
setup-cpp
Template
mirror of https://github.com/aminya/setup-cpp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: remove npm install in docker tests

This commit is contained in:
Amin Yahyaabadi 2023-07-17 10:27:35 -07:00
parent 71e227aa5f
commit f1d59251fb
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -209,7 +209,7 @@ If you want to build the ones included, then run:
```shell ```shell
git clone --recurse-submodules https://github.com/aminya/setup-cpp git clone --recurse-submodules https://github.com/aminya/setup-cpp
cd ./setup-cpp cd ./setup-cpp
docker build -f ./dev/docker/setup-cpp-ubuntu.dockerfile -t setup-cpp . docker build -f ./dev/docker/setup-cpp-ubuntu.dockerfile -t setup-cpp-ubuntu .
``` ```
Where you should use the path to the dockerfile after `-f`. Where you should use the path to the dockerfile after `-f`.

3
dev/docker/__tests__/arch.dockerfile
View File

@ -7,8 +7,7 @@ RUN pacman -Syuu --noconfirm && \
pacman-db-upgrade && \ pacman-db-upgrade && \
# install nodejs # install nodejs
pacman -S --noconfirm --needed nodejs npm && \ pacman -S --noconfirm --needed nodejs npm && \
# install setup-cpp
npm install -g setup-cpp@v0.31.1 && \
# install the compiler and tools # install the compiler and tools
node /usr/lib/setup-cpp/setup-cpp.js \ node /usr/lib/setup-cpp/setup-cpp.js \
--compiler llvm \ --compiler llvm \

3
dev/docker/__tests__/fedora.dockerfile
View File

@ -5,8 +5,7 @@ COPY "./dist/legacy" "/usr/lib/setup-cpp/"
# install nodejs # install nodejs
RUN dnf -y install nodejs npm && \ RUN dnf -y install nodejs npm && \
# install setup-cpp
npm install -g setup-cpp@v0.31.1 && \
# install the compiler and tools # install the compiler and tools
node /usr/lib/setup-cpp/setup-cpp.js \ node /usr/lib/setup-cpp/setup-cpp.js \
--compiler llvm \ --compiler llvm \

3
dev/docker/__tests__/ubuntu.dockerfile
View File

@ -6,8 +6,7 @@ COPY "./dist/legacy" "/usr/lib/setup-cpp/"
RUN apt-get update -qq && \ RUN apt-get update -qq && \
# install nodejs # install nodejs
apt-get install -y --no-install-recommends nodejs npm && \ apt-get install -y --no-install-recommends nodejs npm && \
# install setup-cpp
npm install -g setup-cpp@v0.31.1 && \
# install the compiler and tools # install the compiler and tools
node /usr/lib/setup-cpp/setup-cpp.js \ node /usr/lib/setup-cpp/setup-cpp.js \
--nala true \ --nala true \

4
dev/scripts/generate-docker-tests.mjs
View File

@ -7,10 +7,12 @@ async function main() {
const dockerFileContent = await readFile(`./dev/docker/setup-cpp-${dockerFile}.dockerfile`, "utf-8") const dockerFileContent = await readFile(`./dev/docker/setup-cpp-${dockerFile}.dockerfile`, "utf-8")
const builderExample = await readFile(`./dev/docker/${dockerFile}.dockerfile`, "utf-8") const builderExample = await readFile(`./dev/docker/${dockerFile}.dockerfile`, "utf-8")
// after the first FROM, add COPY "./dist/legacy" "/"
const modifiedDockerFile = dockerFileContent const modifiedDockerFile = dockerFileContent
// load the externally built setup-cpp
.replace(/FROM (.*)/g, `FROM $1\n\nCOPY "./dist/legacy" "/usr/lib/setup-cpp/"`) .replace(/FROM (.*)/g, `FROM $1\n\nCOPY "./dist/legacy" "/usr/lib/setup-cpp/"`)
.replace("setup-cpp ", "node /usr/lib/setup-cpp/setup-cpp.js ") .replace("setup-cpp ", "node /usr/lib/setup-cpp/setup-cpp.js ")
// remove the npm install line
.replace(/# install setup-cpp\n\s*npm install -g setup-cpp.*/, "")
// concat the two files // concat the two files
const newDockerFileContent = `${modifiedDockerFile}\n${builderExample}` const newDockerFileContent = `${modifiedDockerFile}\n${builderExample}`