Skip to content
Snippets Groups Projects
Commit d807022b authored by Igor Munkin's avatar Igor Munkin Committed by Yaroslav Lobankov
Browse files

ci: enable testing on macOS/M1 back

Since JIT is disabled in the previous commit, regular testing on
macOS/M1 can be returned back to Tarantool CI routine. Furthermore, all
specialized targets in .test.mk and auxiliary environment tweaks in
macOS-related workflows are also removed in scope of this patch.

Follows up #8252

NO_DOC=ci
NO_TEST=ci
NO_CHANGELOG=ci
parent f1fc70f4
No related branches found
No related tags found
No related merge requests found
......@@ -58,9 +58,7 @@ jobs:
- name: Install deps
uses: ./.github/actions/install-deps-osx
- name: test
env:
SUFFIX: ${{ matrix.arch == 'aarch64' && '-arm64' || '' }}
run: make -f .test.mk test-osx-debug${SUFFIX}
run: make -f .test.mk test-osx-debug
- name: Send VK Teams message on failure
if: failure()
uses: ./.github/actions/report-job-status
......
......@@ -58,9 +58,7 @@ jobs:
- name: Install deps
uses: ./.github/actions/install-deps-osx
- name: test
env:
SUFFIX: ${{ matrix.arch == 'aarch64' && '-arm64' || '' }}
run: make -f .test.mk test-osx-release${SUFFIX}
run: make -f .test.mk test-osx-release
- name: Send VK Teams message on failure
if: failure()
uses: ./.github/actions/report-job-status
......
......@@ -60,8 +60,7 @@ jobs:
- name: test
env:
CMAKE_EXTRA_PARAMS: -DENABLE_LTO=ON
SUFFIX: ${{ matrix.arch == 'aarch64' && '-arm64' || '' }}
run: make -f .test.mk test-osx-release${SUFFIX}
run: make -f .test.mk test-osx-release
- name: Send VK Teams message on failure
if: failure()
uses: ./.github/actions/report-job-status
......
......@@ -59,9 +59,7 @@ jobs:
- name: Install deps
uses: ./.github/actions/install-deps-osx
- name: test
env:
SUFFIX: ${{ matrix.arch == 'aarch64' && '-arm64' || '' }}
run: make -f .test.mk test-osx-static-cmake${SUFFIX}
run: make -f .test.mk test-osx-static-cmake
- name: Send VK Teams message on failure
if: failure()
uses: ./.github/actions/report-job-status
......
......@@ -164,16 +164,6 @@ test-osx-release: CMAKE_PARAMS = -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DTEST_BUILD=ON
test-osx-release: prebuild-osx build run-luajit-test pretest-osx run-test
# FIXME: Temporary target without tests. Use 'test-release-osx' target instead
# when all M1 issues are resolved:
# LuaJIT tests - https://github.com/tarantool/tarantool/issues/4819
# Tarantool tests - https://github.com/tarantool/tarantool/issues/6068
.PHONY: test-osx-release-arm64
test-osx-release-arm64: CMAKE_PARAMS = -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DENABLE_WERROR=ON \
-DTEST_BUILD=ON
test-osx-release-arm64: prebuild-osx build
# Debug build
.PHONY: test-osx-debug
......@@ -181,15 +171,6 @@ test-osx-debug: CMAKE_PARAMS = -DCMAKE_BUILD_TYPE=Debug \
-DTEST_BUILD=ON
test-osx-debug: prebuild-osx build run-luajit-test pretest-osx run-test
# FIXME: Temporary target without tests. Use 'test-debug-osx' target instead
# when all M1 issues are resolved:
# LuaJIT tests - https://github.com/tarantool/tarantool/issues/4819
# Tarantool tests - https://github.com/tarantool/tarantool/issues/6068
.PHONY: test-osx-debug-arm64
test-osx-debug-arm64: CMAKE_PARAMS = -DCMAKE_BUILD_TYPE=Debug \
-DTEST_BUILD=ON
test-osx-debug-arm64: prebuild-osx build
# Static build
.PHONY: test-osx-static-cmake
......@@ -201,19 +182,6 @@ test-osx-static-cmake: LUAJIT_TEST_BUILD_DIR = ${STATIC_BIN_DIR}
test-osx-static-cmake: TEST_RUN_PARAMS = --builddir ${PWD}/${STATIC_BIN_DIR}
test-osx-static-cmake: prebuild-osx build run-luajit-test pretest-osx run-test
# FIXME: Temporary target without tests. Use 'test-osx-static-cmake' target instead
# when all M1 issues are resolved:
# LuaJIT tests - https://github.com/tarantool/tarantool/issues/4819
# Tarantool tests - https://github.com/tarantool/tarantool/issues/6068
.PHONY: test-osx-static-cmake-arm64
test-osx-static-cmake-arm64: SRC_DIR = ${STATIC_DIR}
test-osx-static-cmake-arm64: BUILD_DIR = ${STATIC_DIR}
test-osx-static-cmake-arm64: CMAKE_PARAMS = -DCMAKE_TARANTOOL_ARGS="-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DENABLE_WERROR=ON;-DTEST_BUILD=ON"
test-osx-static-cmake-arm64: CTEST = true
test-osx-static-cmake-arm64: LUAJIT_TEST_BUILD_DIR = ${STATIC_BIN_DIR}
test-osx-static-cmake-arm64: TEST_RUN_PARAMS = --builddir ${PWD}/${STATIC_BIN_DIR}
test-osx-static-cmake-arm64: prebuild-osx build
##############################
# FreeBSD #
##############################
......@@ -294,4 +262,4 @@ test-luajit-Linux-ARM64: build run-luajit-test run-test
test-luajit-macOS-x86_64: prebuild-osx build run-luajit-test pretest-osx run-test
test-luajit-macOS-ARM64: prebuild-osx build run-luajit-test
test-luajit-macOS-ARM64: prebuild-osx build run-luajit-test pretest-osx run-test
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment