Skip to content
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.

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

Refactor/remove standalone and api #513

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3a95cae
ci: Remove Ruby version update trigger
TimothyJones Mar 15, 2023
8e4f735
feat!: Remove the Ruby verifier and the associated CLI stubs (pact-br…
TimothyJones Mar 15, 2023
e7778da
fix: Remove check for windows long paths as it was only relevant to t…
TimothyJones Mar 15, 2023
e9f569b
feat!: Remove all classes that were backed by the Ruby implementation…
TimothyJones Mar 15, 2023
97d6c0f
test: Remove integration mocks that are no longer needed
TimothyJones Mar 15, 2023
a52fe41
build: Move rimraf to devDependencies; remove a number of now unused …
TimothyJones Mar 15, 2023
6fc16fa
docs: Remove documentation for the APIs that were backed by Ruby
TimothyJones Mar 15, 2023
5de4720
chore: Remove export of file that doesn't exist
TimothyJones Mar 15, 2023
f2e88d0
chore: Remove unused test files
TimothyJones Mar 15, 2023
ca178a8
build: Unzip the binaries anyway, even if they already exist
TimothyJones Mar 15, 2023
61b1a3a
Merge commit '3a95caef41ab6732512f00a3896fa54d2a64715d' into refactor…
YOU54F Jun 8, 2024
759d225
Merge commit 'ca178a85ce281b056c09120652948b17d3334dcc' into refactor…
YOU54F Jun 8, 2024
0f76ad2
chore: remove more bits of ruby standalone code
YOU54F Jun 9, 2024
c6c8b25
chore(ci): exclude windows due to broken gha agent
YOU54F Jun 9, 2024
13cf384
chore(ci): remove linux arm64 check as shared-mime-info is installed …
YOU54F Jun 9, 2024
c6e93df
ci(win): workaround for broken curl 8.8.0 --write-out opt in latest w…
YOU54F Jun 9, 2024
344ae21
Merge branch 'master-pf' into refactor/remove_standalone_and_api
YOU54F Jun 17, 2024
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
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
Loading