Skip to content

Commit e7803b5

Browse files
authored
Merge pull request #513 from YOU54F/refactor/remove_standalone_and_api
Refactor/remove standalone and api
2 parents c89aab1 + 344ae21 commit e7803b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+101
-5171
lines changed

.github/workflows/build-and-test.yml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
node-version: [20]
32-
os: [macos-14,macos-12,ubuntu-latest,windows-latest]
32+
os: [
33+
macos-14,
34+
macos-12,
35+
ubuntu-latest,
36+
windows-latest
37+
]
3338

3439
env:
3540
NODE_VERSION: ${{ matrix.node-version }}
@@ -79,8 +84,12 @@ jobs:
7984
fail-fast: false
8085
matrix:
8186
node-version: [16,18,20]
82-
os: [macos-14, macos-12, ubuntu-latest,windows-latest]
83-
87+
os: [
88+
macos-14,
89+
macos-12,
90+
ubuntu-latest,
91+
windows-latest
92+
]
8493
env:
8594
NODE_VERSION: ${{ matrix.node-version }}
8695
LOG_LEVEL: debug
@@ -103,17 +112,15 @@ jobs:
103112
- run: LOG_LEVEL=debug ./script/ci/unpack-and-test.sh
104113

105114

106-
# Linux aarch64 tests are skipped as QEMU fails when executing the ruby binaries
107-
# Related comment: https://github.com/phusion/passenger/issues/2288#issuecomment-1387625121
108-
# - name: Set up QEMU
109-
# if: runner.os == 'Linux'
110-
# uses: docker/setup-qemu-action@v3
111-
# - name: Set up Docker Buildx
112-
# if: runner.os == 'Linux'
113-
# uses: docker/setup-buildx-action@v3
114-
# - if: runner.os == 'Linux'
115-
# name: test arm64
116-
# run: docker run -v $PWD:/home --platform linux/arm64 --rm node:20 bin/bash -c 'cd /home && /home/script/ci/unpack-and-test.sh'
115+
- name: Set up QEMU
116+
if: runner.os == 'Linux'
117+
uses: docker/setup-qemu-action@v3
118+
- name: Set up Docker Buildx
119+
if: runner.os == 'Linux'
120+
uses: docker/setup-buildx-action@v3
121+
- if: runner.os == 'Linux'
122+
name: test arm64
123+
run: docker run -v $PWD:/home --platform linux/arm64 --rm node:20 bin/bash -c 'cd /home && npm test'
117124

118125
release_dry_run:
119126
runs-on: ubuntu-latest

.github/workflows/update.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.gitignore

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,6 @@ bin/**/**.js
5454
# ts-node cache
5555
ts-node-*
5656

57-
# pact standalone binaries
58-
# standalone/*
59-
standalone/darwin*
60-
standalone/linux*
61-
standalone/windows*
62-
standalone/*.d.ts
63-
standalone/*.js
64-
standalone/*.checksum
65-
standalone/*.gz
66-
standalone/README.md
6757
# FFI native bindings
6858
*.so
6959
*.dll*

DEVELOPER.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ As a developer, you need to run `bash script/ci/prebuild.sh` to
1818
- download the FFI libraries to `ffi` folder
1919
- prebuilds the binaries and outputs to `prebuilds`
2020
- cleans up `ffi` and `build`
21-
- downloads the `pact-ruby-standalone` bindings to `standalone`
2221

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

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

2927
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.

0 commit comments

Comments
 (0)