Skip to content

Commit

Permalink
Merge remote-tracking branch 'pf/master' into master-pf-2.0.0-standalone
Browse files Browse the repository at this point in the history
  • Loading branch information
YOU54F committed May 12, 2023
2 parents 97d1c9e + dac0e46 commit 3ea1a32
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
5 changes: 1 addition & 4 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ BUILD_TEST_TASK_TEMPLATE: &BUILD_TEST_TASK_TEMPLATE
- node --version
- script/ci/build-and-test.sh

## NOTE!!! libyaml-dev is required for linux users
## or they get an error
## libyaml-0.so.2: cannot open shared object file: No such file or directory - /tmp/cirrus-ci-build/standalone/linux-arm64-2.0.0/pact/lib/ruby/lib/ruby/3.2.0/aarch64-linux/psych.so
linux_arm64_task:
env:
matrix:
Expand All @@ -20,7 +17,7 @@ linux_arm64_task:
arm_container:
image: $IMAGE
install_script:
- apt update --yes && apt install --yes curl python3 make build-essential g++ unzip zip libyaml-dev
- apt update --yes && apt install --yes curl python3 make build-essential g++ unzip zip
<< : *BUILD_TEST_TASK_TEMPLATE

linux_amd64_task:
Expand Down
2 changes: 1 addition & 1 deletion DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ npm test
```


_notes_ - As a developer you need you download the FFI libraries prior to running `npm install` / `npm ci` as the libraries will be expected to be there, and you won't have any `node_modules` installed yet.
_notes_ - As a developer, you need to run `bash script/download-libs.sh` to download the FFI libraries prior to running `npm install` / `npm ci` as the libraries will be expected to be there, and you won't have any `node_modules` installed yet.

For end users, the `ffi` folder is populated, as part of the npm publishing step.
3 changes: 2 additions & 1 deletion script/ci/build-and-test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash -eu
set -eu # This needs to be here for windows bash, which doesn't read the #! line above
set -e # This needs to be here for windows bash, which doesn't read the #! line above
set -u

SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the script is running
. "$SCRIPT_DIR"/../lib/robust-bash.sh
Expand Down

0 comments on commit 3ea1a32

Please sign in to comment.