Skip to content

[v12] skip rdpclient build in integration tests #26527

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.

Sign up for GitHub

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

Merged
GavinFrazar merged 2 commits into from
May 25, 2023
Merged

[v12] skip rdpclient build in integration tests #26527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d98ea7
[v12] skip rdpclient build in integration tests
GavinFrazar May 18, 2023
64fa254
Merge branch 'branch/v12' into gavinfrazar/v12-skip-rdpclient-build-i…
GavinFrazar May 25, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests-non-root.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ jobs:

- name: Run tests
timeout-minutes: 40
run: runuser -u ci -g ci make rdpclient integration
run: runuser -u ci -g ci make integration RDPCLIENT_SKIP_BUILD=1
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests-root.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ jobs:
- name: Run tests
timeout-minutes: 40
run: |
make rdpclient integration-root
make integration-root RDPCLIENT_SKIP_BUILD=1
12 changes: 9 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,21 @@ CHECK_RUST := $(shell rustc --version 2>/dev/null)
# TODO: Delete when it becomes default in Rust 1.70.0
export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse

with_rdpclient := no
RDPCLIENT_MESSAGE := without-Windows-RDP-client

CARGO_TARGET_darwin_amd64 := x86_64-apple-darwin
CARGO_TARGET_darwin_arm64 := aarch64-apple-darwin
CARGO_TARGET_linux_arm64 := aarch64-unknown-linux-gnu
CARGO_TARGET_linux_amd64 := x86_64-unknown-linux-gnu

CARGO_TARGET := --target=${CARGO_TARGET_${OS}_${ARCH}}

# If set to 1, Windows RDP client is not built.
RDPCLIENT_SKIP_BUILD ?= 0

# Enable Windows RDP client build?
with_rdpclient := no
RDPCLIENT_MESSAGE := without-Windows-RDP-client

ifeq ($(RDPCLIENT_SKIP_BUILD),0)
ifneq ($(CHECK_RUST),)
ifneq ($(CHECK_CARGO),)

Expand All @@ -110,6 +115,7 @@ RDPCLIENT_TAG := desktop_access_rdp
endif
endif

endif
endif
endif

Expand Down