-
Notifications
You must be signed in to change notification settings - Fork 3
Add MacOS to integration tests CI #393
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ env: | |
| branches: | ||
| - '**' | ||
| jobs: | ||
| build-and-run-tests: | ||
| linux-integration-tests: | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
|
|
@@ -52,3 +52,53 @@ jobs: | |
| CCM_IS_SCYLLA: "true" | ||
| CCM_PATH: "./scylla-ccm" | ||
| run: npm run integration | ||
| macos-integration-tests: | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| settings: | ||
| - host: macos-15-intel | ||
| target: x86_64-apple-darwin | ||
| build: npm run build -- --target x86_64-apple-darwin | ||
| name: Build and run integration tests - ${{ matrix.settings.target }} - node@20 | ||
| runs-on: ${{ matrix.settings.host }} | ||
| timeout-minutes: 30 | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: ./.github/setup | ||
| with: | ||
| host: ${{ matrix.settings.host }} | ||
| target: ${{ matrix.settings.target }} | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: '8' | ||
| - name: Install ccm | ||
| # We need a copy of the repo for the ssl tests. | ||
| # When installing ccm as a package, we do not save the certificates, | ||
| # that are present in the ./ssl directory | ||
| run: | | ||
| git clone https://github.com/scylladb/scylla-ccm.git | ||
| python3 -m venv ./venv | ||
| source ./venv/bin/activate | ||
| pip install https://github.com/adespawn/scylla-ccm/archive/macos-proper-fix.zip | ||
| - name: Enable interfaces | ||
| # We need to manually enable the interfaces on macos | ||
| # https://github.com/scylladb/scylla-ccm?tab=readme-ov-file#requirements | ||
| run: | | ||
| sudo ifconfig lo0 alias 127.0.0.2 up | ||
| sudo ifconfig lo0 alias 127.0.0.3 up | ||
| sudo ifconfig lo0 alias 127.0.0.4 up | ||
| sudo ifconfig lo0 alias 127.0.0.5 up | ||
| sudo ifconfig lo0 alias 127.0.0.6 up | ||
| - name: Build | ||
| run: ${{ matrix.settings.build }} | ||
| shell: bash | ||
| - name: Run integration tests on cassandra | ||
| env: | ||
| CUSTOM_JAVA_HOME: __USE_JAVA_IN_PATH__ | ||
| CCM_IS_SCYLLA: "false" | ||
| CCM_PATH: "./scylla-ccm" | ||
|
Comment on lines
+97
to
+101
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. D o c u m e n t a t i o n
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. still unresolved. |
||
| run: | | ||
| source ./venv/bin/activate | ||
| npm run integration | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,8 @@ | |
| "napi": { | ||
| "binary-name": "scylladb-driver-alpha", | ||
| "targets": [ | ||
| "x86_64-unknown-linux-gnu" | ||
| "x86_64-unknown-linux-gnu", | ||
| "x86_64-apple-darwin" | ||
| ] | ||
|
Comment on lines
22
to
25
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A small inconsistency on may part here. For linux arm I planned to add this, when adding it to release CI. Here I added it alongside CI. Doesn't really matter if it's here or there
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ❓ Why doesn't it matter where it is: in release CI or in (regular?) CI? |
||
| }, | ||
| "repository": { | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note: I'm using a fork branch at the moment: will have to get those changes merged to main
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So let's wait until they get merged.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the status of this?