Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 35 additions & 1 deletion .github/workflows/build-cpack-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,21 @@ jobs:
steps:
Comment thread
dkropachev marked this conversation as resolved.
- uses: actions/checkout@v4

- uses: actions-rust-lang/setup-rust-toolchain@v1

- name: Build and test DEB packages
run: make test-package-deb

- name: Verify static package smoke test
run: make test-package-deb-static-smoke

- name: Verify static linking builds (regression test for issue #164)
run: |
sudo apt-get update -y
make install-build-dependencies
make build-static-integration-test-bin
rm -rf build-static

- name: Collect artifacts
if: inputs.save-artifacts
run: make collect-package-artifacts
Expand Down Expand Up @@ -75,7 +87,7 @@ jobs:
--health-retries 60
steps:
- name: Install dependencies
run: dnf -y install git make cmake gcc-c++ findutils rpm-build ninja-build pkgconf-pkg-config openssl-devel clang
run: dnf -y install git make cmake gcc-c++ findutils rpm-build ninja-build pkgconf-pkg-config openssl-devel zlib-devel clang

- uses: actions/checkout@v4

Expand All @@ -84,6 +96,9 @@ jobs:
- name: Build and test RPM packages
run: make test-package-rpm-native SCYLLA_HOST=scylla SKIP_DOCKER_COMPOSE=1

- name: Verify static package smoke test
run: make test-package-rpm-native-static-smoke SCYLLA_HOST=scylla SKIP_DOCKER_COMPOSE=1

- name: Collect artifacts
if: inputs.save-artifacts
run: make collect-package-artifacts
Expand All @@ -109,6 +124,14 @@ jobs:
- name: Build and test macOS packages (PKG + DMG)
run: gmake test-package-macos

- name: Verify static package smoke test
run: gmake test-package-macos-static-smoke

- name: Verify static linking builds (regression test for issue #164)
run: |
gmake build-static-integration-test-bin
rm -rf build-static

- name: Collect artifacts
if: inputs.save-artifacts
run: gmake collect-package-artifacts
Expand All @@ -126,9 +149,20 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions-rust-lang/setup-rust-toolchain@v1

- name: Build and test Windows packages (MSI)
run: make test-package-windows

- name: Verify static package smoke test
run: make test-package-windows-static-smoke

- name: Verify static linking builds (regression test for issue #164)
run: |
make build-static-integration-test-bin
if (Test-Path 'build-static') { Remove-Item -Recurse -Force 'build-static' }
shell: pwsh

- name: Collect artifacts
if: inputs.save-artifacts
run: make collect-package-artifacts
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/build-lint-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:
env:
CARGO_TERM_COLOR: always
# Should include `INTEGRATION_TEST_BIN` from the `Makefile`
# TODO: Remove `build/libscylla-cpp-driver.*` after https://github.com/scylladb/cpp-rs-driver/issues/164 is fixed.
INTEGRATION_TEST_BIN: |
build/cassandra-integration-tests
build/libscylla-cpp-driver.*
Comment on lines -12 to 15
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔 You removed the TODO but didn't do what it was saying.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move it out ot a separate commit with explanation.

Expand Down Expand Up @@ -45,6 +44,11 @@ jobs:
id: build-integration-test-bin
run: make build-integration-test-bin

- name: Verify static linking builds (regression test for issue #164)
run: |
make build-static-integration-test-bin
rm -rf build-static

- name: Save integration test binary
uses: actions/cache/save@v4
id: save-integration-test-bin
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.vscode/
.zed
build/
build-static/
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔧 This is added to .gitignore only in commit makefile: factor static build targets, but the first commit already mentions this path.

build-macos/
**/build/
**/build-macos/
Expand Down
Loading
Loading