Skip to content

Commit

Permalink
Merge pull request #513 from YOU54F/refactor/remove_standalone_and_api
Browse files Browse the repository at this point in the history
Refactor/remove standalone and api
  • Loading branch information
YOU54F authored Jun 17, 2024
2 parents c89aab1 + 344ae21 commit e7803b5
Show file tree
Hide file tree
Showing 65 changed files with 101 additions and 5,171 deletions.
35 changes: 21 additions & 14 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ jobs:
fail-fast: false
matrix:
node-version: [20]
os: [macos-14,macos-12,ubuntu-latest,windows-latest]
os: [
macos-14,
macos-12,
ubuntu-latest,
windows-latest
]

env:
NODE_VERSION: ${{ matrix.node-version }}
Expand Down Expand Up @@ -79,8 +84,12 @@ jobs:
fail-fast: false
matrix:
node-version: [16,18,20]
os: [macos-14, macos-12, ubuntu-latest,windows-latest]

os: [
macos-14,
macos-12,
ubuntu-latest,
windows-latest
]
env:
NODE_VERSION: ${{ matrix.node-version }}
LOG_LEVEL: debug
Expand All @@ -103,17 +112,15 @@ jobs:
- run: LOG_LEVEL=debug ./script/ci/unpack-and-test.sh


# Linux aarch64 tests are skipped as QEMU fails when executing the ruby binaries
# Related comment: https://github.com/phusion/passenger/issues/2288#issuecomment-1387625121
# - name: Set up QEMU
# if: runner.os == 'Linux'
# uses: docker/setup-qemu-action@v3
# - name: Set up Docker Buildx
# if: runner.os == 'Linux'
# uses: docker/setup-buildx-action@v3
# - if: runner.os == 'Linux'
# name: test arm64
# run: docker run -v $PWD:/home --platform linux/arm64 --rm node:20 bin/bash -c 'cd /home && /home/script/ci/unpack-and-test.sh'
- name: Set up QEMU
if: runner.os == 'Linux'
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
if: runner.os == 'Linux'
uses: docker/setup-buildx-action@v3
- if: runner.os == 'Linux'
name: test arm64
run: docker run -v $PWD:/home --platform linux/arm64 --rm node:20 bin/bash -c 'cd /home && npm test'

release_dry_run:
runs-on: ubuntu-latest
Expand Down
21 changes: 0 additions & 21 deletions .github/workflows/update.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,6 @@ bin/**/**.js
# ts-node cache
ts-node-*

# pact standalone binaries
# standalone/*
standalone/darwin*
standalone/linux*
standalone/windows*
standalone/*.d.ts
standalone/*.js
standalone/*.checksum
standalone/*.gz
standalone/README.md
# FFI native bindings
*.so
*.dll*
Expand Down
2 changes: 0 additions & 2 deletions DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ As a developer, you need to run `bash script/ci/prebuild.sh` to
- download the FFI libraries to `ffi` folder
- prebuilds the binaries and outputs to `prebuilds`
- cleans up `ffi` and `build`
- downloads the `pact-ruby-standalone` bindings to `standalone`

For end users, the following is provided as part of the packaging and release step in CI.

- the `prebuilds` folder containing built `ffi` bindings
- the `standalone` folder containing the pact ruby standalone bindings is populated,
- the `binding.gyp` file is removed from the npm package, so `npm install` doesn't attempt to build the `ffi` buildings, that are prebuilt.

If you have a `binding.gyp` file, and have created `prebuilds` you will want to perform `npm ci` or `npm install` with `--ignore-scripts` set, to avoid building the `ffi` which is prebuilt.
Expand Down
Loading

0 comments on commit e7803b5

Please sign in to comment.