fix: fix docker base name

This commit is contained in:
Amin Yahyaabadi 2023-07-15 15:50:55 -07:00
parent b2cf91c9df
commit d2fe82a0d2
4 changed files with 4 additions and 6 deletions

View File

@ -38,6 +38,7 @@ jobs:
path: |
~/.pnpm-store
D:\.pnpm-store
./node_modules
key: "setupcpp-cache-OS:${{ matrix.os }}-node:${{ matrix.node }}-pnpm:${{ matrix.pnpm }}-${{ hashFiles('./.npmrc') }}-deps:${{ hashFiles('./package.json') }}"
restore-keys: |
"setupcpp-cache-OS:${{ matrix.os }}-"
@ -151,6 +152,7 @@ jobs:
path: |
~/.pnpm-store
D:\.pnpm-store
./node_modules
key: "setupcpp-docker-cache-OS:${{ matrix.os }}-${{ hashFiles('./.npmrc') }}-deps:${{ hashFiles('./package.json') }}"
restore-keys: |
"setupcpp-docker-cache-OS:${{ matrix.os }}"

View File

@ -15,7 +15,7 @@ RUN node /setup-cpp.js --compiler llvm --cmake true --ninja true --cppcheck true
ENTRYPOINT ["/bin/bash"]
#### Building (example)
FROM setup-cpp AS example-builder
FROM base AS example-builder
COPY ./dev/cpp_vcpkg_project /home/app
WORKDIR /home/app
RUN bash -c 'source ~/.cpprc \

View File

@ -14,7 +14,7 @@ RUN node /setup-cpp.js --compiler llvm --cmake true --ninja true --cppcheck true
ENTRYPOINT ["/bin/bash"]
#### Building (example)
FROM setup-cpp AS example-builder
FROM base AS example-builder
COPY ./dev/cpp_vcpkg_project /home/app
WORKDIR /home/app
RUN bash -c 'source ~/.cpprc \

View File

@ -5,10 +5,6 @@
"repository": "https://github.com/aminya/setup-cpp",
"license": "Apache-2.0",
"author": "Amin Yahyaabadi",
"exports": {
"import": "./dist/modern/setup-cpp.mjs",
"require": "./dist/legacy/setup-cpp.js"
},
"main": "dist/legacy/setup-cpp.js",
"actions": "./dist/actions/setup-cpp.js",
"modern": "./dist/modern/setup-cpp.js",