Skip to content

Commit

Permalink
Fix backward compatibility for m1 build (#7262)
Browse files Browse the repository at this point in the history
* Fix backward compatibility for m1 build

* Update ChangeLog
  • Loading branch information
SerhiiGadzhilov authored and aquacash5 committed May 11, 2023
1 parent 455c59b commit 06a860d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/job-build-mac-m1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ jobs:
mkdir build
cd build
cmake \
-DCMAKE_OSX_DEPLOYMENT_TARGET=11 \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH="$(brew --prefix qt5);$(brew --prefix openssl)" ..
. ./version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job-test-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
target: "10.14"
shell: "bash"
- os: [self-hosted, macOS, arm64]
target: ""
target: "11"
shell: "/usr/bin/arch -arch arm64e /bin/bash --noprofile --norc -eo pipefail {0}"

env:
Expand Down
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Bug fixes:
- #7208 Fix crash on FreeBSD when pressing special keys on a client.
- #7241 Change the default signature hashing algorithm for sha256.
- #7242 Fix tls certificate generation for flatpak.
- #7262 Fix backward compatibility for m1 and m2 builds.

Enhancements:
- #7222 Ability to initiate non-TLS connection from server
Expand Down

0 comments on commit 06a860d

Please sign in to comment.