Skip to content

chore: add back support for generating signable binaries #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 25, 2020
Merged

chore: add back support for generating signable binaries #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4e7cd1
chore: add back support for generating signable binaries
addaleax Sep 22, 2020
bf15738
fixup! chore: add back support for generating signable binaries
addaleax Sep 23, 2020
12c19f8
Add dockerfile for build environment
addaleax Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions .evergreen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,20 @@ variables:
source .evergreen/.setup_env
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
export EVERGREEN_EXPANSIONS_PATH="$(pwd)/../tmp/expansions.yaml"
npm run evergreen-release package
if [ `uname` == Linux ]; then
mkdir -p tmp
cp "$(pwd)/../tmp/expansions.yaml" tmp/expansions.yaml
(cd scripts/docker && docker build -t ubuntu16.04-build -f ubuntu16.04-build.Dockerfile .)
echo Starting Docker container build
docker run -e PUPPETEER_SKIP_CHROMIUM_DOWNLOAD \
-e EVERGREEN_EXPANSIONS_PATH=/tmp/build/tmp/expansions.yaml \
-e NODE_JS_VERSION \
-e BUILD_VARIANT \
--rm -v $PWD:/tmp/build --network host ubuntu16.04-build \
-c 'cd /tmp/build && npm run evergreen-release package'
else
npm run evergreen-release package
fi
RELEASE_MONGOSH

if [ `uname` == Darwin ]; then
Expand Down Expand Up @@ -273,8 +286,8 @@ buildvariants:
- name: test
- name: release_linux
- name: rhel
display_name: "RHEL 8.0"
run_on: rhel80-large
display_name: "RHEL 8.0 (in Ubuntu docker)"
run_on: ubuntu1804-test
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ubuntu1804-test has docker installed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently 🤷‍♀️

tasks:
- name: check
- name: release_rhel
Expand All @@ -286,8 +299,8 @@ buildvariants:
- name: test_ps
- name: release_win_ps
- name: debian
display_name: "Debian 10"
run_on: debian10-large
display_name: "Debian 10 (in Ubuntu docker)"
run_on: ubuntu1804-test
tasks:
- name: check
- name: release_debian
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/.install_node
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export NODE_JS_VERSION='12.4.0'
export NODE_JS_VERSION='12.18.4'

curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
export NVM_DIR="$HOME/.nvm"
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/InstallNode.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$version = "12.4.0"
$version = "12.18.4"
$url = "https://nodejs.org/download/release/v$version/node-v$version-win-x64.zip"
$filename = "node.zip"
$node_zip = "$PSScriptRoot\$filename"
Expand Down
3 changes: 2 additions & 1 deletion .evergreen/SetupEnv.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
$version = "12.4.0"
$version = "12.18.4"
$Env:PATH = "$PSScriptRoot\node-v$version-win-x64;C:\Program Files\Git\mingw32\libexec\git-core;$Env:PATH"
$Env:NODE_JS_VERSION = "$version"

echo "Using node version:"
node --version
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ Compile just the CLI:
npm run compile-ts
```

Compile the standalone executable:
Compile the standalone executable (this may take some time):

```shell
npm run compile-exec
Expand All @@ -170,7 +170,7 @@ npm run compile-exec
Compile a specific package, e.g. the `.deb` for Debian:

```shell
npm run release -- --dry --build-variant=Debian
npm run evergreen-release package -- --dry --build-variant=Debian
```

## Contributing
Expand Down
1 change: 1 addition & 0 deletions config/build.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ module.exports = {
isCi: process.env.IS_CI === 'true',
isPatch: process.env.IS_PATCH === 'true',
platform: os.platform(),
execNodeVersion: process.env.NODE_JS_VERSION || `^${process.version.slice(1)}`,
buildVariant: process.env.BUILD_VARIANT,
repo: {
owner: 'mongodb-js',
Expand Down
Loading