Commit Graph

3932 Commits

Author SHA1 Message Date
Dom Rodriguez
fabeb618a9 Remove Debug build agents for Mac CI jobs
This addresses @p12tic's feedback regarding CI CPU time.

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:49 +00:00
Dom Rodriguez
20f0583c18 As per @p12tic's feedback on PR #1385, revert previous log message
@p12tic felt that we should have the log message at the end of the build
script to assist log inspections

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:49 +00:00
Dom Rodriguez
0ac60d34e9 Remove Release type condition for artifact publishing (Mac)
This commit removes the 'Release' `B_BUILD_TYPE` condition for the Mac
builder, and instead just keeps the condition of the image ONLY to be
built by the Big Sur build agent.

Now, the reason for that condition is because I am future proofing the
CI configuration for when we ship M1 builds. Currently, we do not. The
other reason, but also more pressing, is to avoid multiple artifacts
being published. There *is* a possibility the Big Sur build agent
becomes incompatible with older macOS releases, but the CMake
configuration would seem to suggest there's backwards compatibility
being available.

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:49 +00:00
Dom Rodriguez
275f19461d Revert artifact name to original name (Mac)
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:49 +00:00
Dom Rodriguez
af99862143 Revert Mac build job name to original name
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:49 +00:00
Dom Rodriguez
bafd58387f Simplify sourcing of environment overriding script
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:49 +00:00
Dom Rodriguez
c61e98169c Remove obvious comments
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:49 +00:00
Dom Rodriguez
09863ead1b Remove redundant exit command
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:49 +00:00
Dom Rodriguez
c05efd2393 Remove experimental Rust code - what?
I was working on experimental Rust code to see if it'd be possible to glue C++ and Rust together, and didn't stash it. When I did `git add`, it added the Rust code, and ... yeah, whoops.

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:49 +00:00
Dom Rodriguez
db90a85aa4 Remove file existence check for Mac environment variables
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:48 +00:00
Dom Rodriguez
08128f9a07 Remove Universal Binary reference in Mac Release build
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:48 +00:00
Dom Rodriguez
8ee832263b Revert back to previous building behaviour on *nix/Mac systems
This is based on the feedback from @p12tic, and I also think it might
lead to a regression on systems that don't have the correct version of CMake,
and/or a Make implementation that doesn't support "-C".

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:48 +00:00
Dom Rodriguez
ac1148a8b8 Remove noisy commented-out code in CMakeLists.txt
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:48 +00:00
Dom Rodriguez
21de971a94 Simplify build directory clean up
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:48 +00:00
Dom Rodriguez
16b2f93bf5 Remove check for macos_environment.sh - no need for it
We can just do a one-liner here, if it fails, the script fails, and it
should do that. Also renamed macOS_environment to all lower-case (and snake_case).

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:48 +00:00
Dom Rodriguez
cb754b6799 Simplify B_CMAKE_FLAGS, and declare before further configuration
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:48 +00:00
Dom Rodriguez
4308e91214 Remove redundant comments and output as per @p12tic's feedback
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:48 +00:00
Dom Rodriguez
61898a6509 Renamed Mac env script as per @p12tic's feedback
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:48 +00:00
Dom Rodriguez
5d50eec10d Disable arm64 & x86_64 Mac builds - Qt causes build failures
Related to #1395.

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:47 +00:00
Dom Rodriguez
2e0f54822e Simplify CI jobs, and merge DMG generation into one job
This commit merges the macOSRelease job into one unified Mac build job.

Using Azure Pipelines conditionals (AND), we check for the build type being an release, and the build agent being Big Sur.

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:47 +00:00
Dom Rodriguez
f1c5405873 Modify CI configuration - Mac matrix dual builds
This commit changes the CI configuration to dual-build Release and Debug types
for the Mac build agents - Mojave, Catalina and Big Sur. This ensures for a double check on each build type during testing.

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:47 +00:00
Dom Rodriguez
55dac2333d Remove CMAKE_OSX_ARCHITECTURES env variable, wrong place
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:47 +00:00
Dom Rodriguez
464949b402 Adjust CMakeLists to compile for M1 and x86
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:47 +00:00
Dom Rodriguez
f5c759a910 Refactoring of CI configurations and build scripts
Now, CI builds for macOS involve three separate builds for a range of macOS versions, and a final Universal macOS Binary made on Big Sur. It should work with the M1 chip and x86_64 Intel Macs.

I have also renamed osx_environment->macOS_environment.sh to reflect the new name change of Apple's desktop OS.

In terms of the clean_builds.sh script, this has also been refactored to be more resilient, and efficient (marginally).

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 17:52:47 +00:00
Dom Rodriguez
4ed0141389 Merge pull request #1403 from shymega/fix/template/pull-request-template-clarify
Clarify PR template with regards to user-visible changes
2021-11-06 16:39:24 +00:00
Dom Rodriguez
37e7741942 Clarify PR template with regards to user-visible changes to Barrier
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-06 16:25:57 +00:00
Dom Rodriguez
2fcffcdaa9 Merge pull request #1091 from xkr47/patch-1
ServerApp help: Describe the role of the server
2021-11-05 20:55:21 +00:00
Jonas Berlin
2c8f92206f ServerApp help: Describe the role of the server
Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2021-11-05 19:52:15 +00:00
Dom Rodriguez
69ec896e65 Merge pull request #1391 from p12tic/github-no-automatic-labels
github: Don't automatically add labels to bug reports
2021-11-05 14:44:27 +00:00
Povilas Kanapickas
13d8cd0d65 Merge pull request #1375 from maboroshin/master
translation: ja-JP 2.4.0
2021-11-05 14:45:39 +02:00
Povilas Kanapickas
4e082404f1 Merge pull request #1390 from p12tic/new-releases-numbers
Update releasing procedure for release numbers and add missing details
2021-11-05 14:43:50 +02:00
Povilas Kanapickas
b33af1f94c github: Don't automatically add labels to bug reports
Many bug reports are not about bugs (e.g. just hard to understand
behavior and so on) and some of the remaining are not about bugs in our
project.

It's up to the person doing bug triage to mark whether one believes this
is really a bug or no. Adding "bug" label to everything just introduces
noise.
2021-11-05 14:15:47 +02:00
maboroshin
3153062611 translation: ja-JP 2.4.0
Adjust, fix shortcut keys, translate new strings
2021-11-05 14:12:14 +02:00
Povilas Kanapickas
40d4a58b1c RELEASING: Specify that newest macOS release dmg should be used 2021-11-05 14:10:51 +02:00
Povilas Kanapickas
d874e5f729 RELEASING: Add missing details about updating version numbers 2021-11-05 14:10:51 +02:00
Povilas Kanapickas
584306bf46 github: Add new releases to new issue template dialog 2021-11-05 14:10:50 +02:00
Povilas Kanapickas
8388f229dd Merge pull request #1388 from p12tic/fix-win-build
newsfragments: Fix path that can't be checked out on Windows
2021-11-05 14:10:10 +02:00
Povilas Kanapickas
f4e2e51ce4 newsfragments: Fix path that can't be checked out on Windows 2021-11-05 13:54:07 +02:00
Dom Rodriguez
3a24a76de3 Merge pull request #1260 from jgrisham/patch-1
Modify macOS build files to only allow GUI launch on supported OS versions (and associated documentation change)
2021-11-04 22:50:23 +00:00
Jim Grisham
f8d538f29e Rename macos-launchinfo.bugfix: to 1260_macos-launchinfo.bugfix:
Updated filename to begin with issue number (per the [twisted/towncrier](https://github.com/twisted/towncrier#readme) documentation).
2021-11-04 14:45:11 -07:00
Jim Grisham
842c75747a Create 1260_update-faqs.doc 2021-11-04 14:40:44 -07:00
Jim Grisham
e46b8e558f Create macos-launchinfo.bugfix: 2021-11-04 14:35:51 -07:00
Jim Grisham
cc6067a543 Updated README.md based on PR peer-review comments
Added changes recommended by @shymega in https://github.com/debauchee/barrier/pull/1260
2021-11-04 14:29:00 -07:00
Jim Grisham
dc6ddbc246 Merge branch 'master' into patch-1 2021-11-04 16:08:33 -04:00
Povilas Kanapickas
dc7aa012d5 Merge pull request #1368 from chewi/cstddef-null
Add missing cstddef includes for NULL
2021-11-03 22:57:58 +02:00
James Le Cuirot
4b12265ae5 Add missing cstddef includes for NULL
Fixes https://github.com/debauchee/barrier/issues/1366.
2021-11-03 18:12:56 +02:00
Povilas Kanapickas
141ab9ecb4 Merge pull request #1379 from p12tic/github-pr-template
github: Add pull request template
2021-11-03 14:47:49 +02:00
Povilas Kanapickas
bfc465d477 github: Add pull request template 2021-11-03 14:15:02 +02:00
Povilas Kanapickas
ac5a1bfd3b Merge pull request #1254 from yan12125/fix-wrong-encoding-for-text-copied-between-linux-and-windows
Fix wrong encoding for text copied between linux and windows
2021-11-03 03:33:28 +02:00
Chih-Hsuan Yen
dd3ea8adfe lib/platform: Fix encoding for text copied between linux and windows
Copied from https://github.com/symless/synergy-core/pull/7029. I don't
include the application/x-moz-nativehtml part in that patch as I already
added it in https://github.com/debauchee/barrier/pull/1164.

Fixes https://github.com/debauchee/barrier/issues/1037
Fixes https://github.com/debauchee/barrier/issues/1137

Original author: Serhii Hadzhilov <serhii-external@symless.com>
2021-11-03 03:12:41 +02:00