Skip to content

Commit c41d430

Browse files
committed
fix: rename the built executables to include architecture and use -
BREAKING CHANGE the built executables are now renamed to include the architecture. See the readme for more information
1 parent 477360f commit c41d430

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

.github/workflows/CI.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ jobs:
103103
gzip: folders
104104
draft: true
105105
files: >
106-
./exe/setup_cpp_windows.exe
107-
./exe/setup_cpp_linux
108-
./exe/setup_cpp_mac
106+
./exe/setup-cpp-x64-windows.exe
107+
./exe/setup-cpp-x64-linux
108+
./exe/setup-cpp-x64-macos
109109
./dist/node12/setup-cpp.js
110110
./dist/node12/setup-cpp.js.map
111111
./dist/node12/

README.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,27 +41,27 @@ Download the executable for your platform from [here](https://github.com/aminya/
4141
An example that installs llvm, cmake, ninja, ccache, and vcpkg:
4242

4343
```ps1
44-
# windows example (open shell as admin)
45-
curl.exe -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.25.1/setup_cpp_windows.exe"
46-
.\setup_cpp_windows --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
44+
# windows example (open PowerShell as admin)
45+
curl -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.25.1/setup-cpp-x64-windows.exe"
46+
./setup-cpp-x64-windows --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
4747
4848
RefreshEnv.cmd # activate cpp environment variables
4949
```
5050

5151
```ps1
5252
# linux example
53-
wget "https://github.com/aminya/setup-cpp/releases/download/v0.25.1/setup_cpp_linux"
54-
chmod +x setup_cpp_linux
55-
sudo ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
53+
wget "https://github.com/aminya/setup-cpp/releases/download/v0.25.1/setup-cpp-x64-linux"
54+
chmod +x ./setup-cpp-x64-linux
55+
sudo ./setup-cpp-x64-linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
5656
5757
source ~/.cpprc # activate cpp environment variables
5858
```
5959

6060
```ps1
61-
# mac example
62-
wget "https://github.com/aminya/setup-cpp/releases/download/v0.25.1/setup_cpp_mac"
63-
chmod +x setup_cpp_mac
64-
sudo ./setup_cpp_mac --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
61+
# macos example
62+
wget "https://github.com/aminya/setup-cpp/releases/download/v0.25.1/setup-cpp-x64-macos"
63+
chmod +x ./setup-cpp-x64-macos
64+
sudo ./setup-cpp-x64-macos --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
6565
6666
source ~/.cpprc # activate cpp environment variables
6767
```
@@ -170,11 +170,11 @@ FROM ubuntu:22.04 AS base
170170
WORKDIR "/"
171171
RUN apt-get update -qq
172172
RUN apt-get install -y --no-install-recommends wget
173-
RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.25.1/setup_cpp_linux"
174-
RUN chmod +x ./setup_cpp_linux
173+
RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.25.1/setup-cpp-x64-linux"
174+
RUN chmod +x ./setup-cpp-x64-linux
175175

176176
# install llvm, cmake, ninja, and ccache
177-
RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --make true
177+
RUN ./setup-cpp-x64-linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --make true
178178

179179
CMD source ~/.cpprc
180180
ENTRYPOINT [ "/bin/bash" ]
@@ -262,9 +262,9 @@ stages:
262262
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
263263

264264
.setup-cpp: &setup-cpp |
265-
curl -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.25.1/setup_cpp_linux"
266-
chmod +x setup_cpp_linux
267-
./setup_cpp_linux --compiler $compiler --cmake true --ninja true --ccache true --vcpkg true
265+
curl -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.25.1/setup-cpp-x64-linux"
266+
chmod +x setup-cpp-x64-linux
267+
./setup-cpp-x64-linux --compiler $compiler --cmake true --ninja true --ccache true --vcpkg true
268268
source ~/.cpprc
269269

270270
.test: &test |

dev/docker/ubuntu.dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ FROM ubuntu:22.04 AS base
55
WORKDIR "/"
66
RUN apt-get update -qq
77
RUN apt-get install -y --no-install-recommends wget
8-
RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.25.1/setup_cpp_linux"
9-
RUN chmod +x ./setup_cpp_linux
8+
RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.25.1/setup-cpp-x64-linux"
9+
RUN chmod +x ./setup-cpp-x64-linux
1010

1111
# install llvm, cmake, ninja, and ccache
12-
RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --task true
12+
RUN ./setup-cpp-x64-linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --task true
1313

1414
CMD source ~/.cpprc
1515
ENTRYPOINT [ "/bin/bash" ]

dev/scripts/pack-exe.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function getPlatformName() {
77
return "windows"
88
}
99
case "darwin": {
10-
return "mac"
10+
return "macos"
1111
}
1212
default: {
1313
return process.platform
@@ -31,7 +31,7 @@ function main() {
3131
"--input",
3232
"./dist/node16",
3333
"--output",
34-
`./exe/setup_cpp_${getPlatformName()}${exe}`,
34+
`./exe/setup-cpp-${process.arch}-${getPlatformName()}${exe}`,
3535
"--",
3636
`{{caxa}}/node_modules/.bin/node${exe}`,
3737
`{{caxa}}/setup-cpp.js`,

0 commit comments

Comments
 (0)