aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/validate.yml3
-rw-r--r--xmake.lua6
2 files changed, 7 insertions, 2 deletions
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 99f2a4f8e..7487297f4 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -234,9 +234,8 @@ jobs:
name: reports-macos
path: build/reports/*.xml
- # signing temporarily disabled due to runner issues
- name: Bundle
- if: ${{ matrix.config == 'release' && 1 == 2 }}
+ if: ${{ matrix.config == 'release' }}
run: |
xmake bundle -v -y --codesignidentity="Developer ID Application"
env:
diff --git a/xmake.lua b/xmake.lua
index 7ada74977..a8256dbd5 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -93,6 +93,12 @@ if is_os("windows") then
-- add_ldflags("/MAP")
end
+if is_os("macosx") then
+ -- temporary workaround for xcode 12.1 (UE minimum spec is 12.5)
+ -- TODO: once CI is updated we should remove this
+ add_defines("_LIBCPP_DISABLE_AVAILABILITY")
+end
+
if is_os("linux") or is_os("macosx") then
add_cxxflags("-Wno-implicit-fallthrough")
add_cxxflags("-Wno-missing-field-initializers")