Skip to content

Commit 31617ff

Browse files
committed
ci:test
1 parent 1bdce61 commit 31617ff

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

.github/workflows/Centos_build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ jobs:
7979
8080
chmod 777 *
8181
./XEngine_LINEnv.sh -i 3
82-
dnf install mongo-c-driver-devel -y
8382
- name: make
8483
run: |
8584
cd XEngine_Source

.github/workflows/macbuild.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
include:
2020
- os: macos-15
2121
- os: macos-15-intel
22+
- os: macos-26
23+
- os: macos-26-intel
2224
runs-on: ${{ matrix.os }}
2325

2426
steps:
@@ -46,13 +48,13 @@ jobs:
4648
run: echo "TERM=xterm" >> $GITHUB_ENV
4749

4850
- name: Set up Dependency x86_64 Environment
49-
if: matrix.os == 'macos-15-intel'
51+
if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-26-intel'
5052
run: |
5153
cd libxengine
5254
chmod 777 *
5355
./XEngine_LINEnv.sh -i 3
5456
- name: Set up Dependency Arm64 Environment
55-
if: matrix.os == 'macos-15'
57+
if: matrix.os == 'macos-15' || matrix.os == 'macos-26'
5658
run: |
5759
latest_tag=$(git ls-remote --tags --sort="v:refname" https://github.com/libxengine/libxengine.git | awk '{print $2}' | sed 's/refs\/tags\///' | tail -n 1)
5860
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Mac_Arm64.zip

XEngine_Source/XEngine_StorageApp/Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LOADSO = -L ../XEngine_DependLibrary/XEngine_Module/jsoncpp -L ../XEngine_Depen
55
-L ../StorageModule_Database -L ../StorageModule_Config -L ../StorageModule_Session -L ../StorageModule_APIHelp -L ../StorageModule_Protocol -L ../StorageModule_BTorrent
66
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_Cryption -lXClient_APIHelp -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_HttpProtocol \
77
-lStorageModule_Database -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp -lStorageModule_Protocol -lStorageModule_BTorrent \
8-
-ljsoncpp -ltinyxml2 -lXEngine_InfoReport -lXEngine_Verification
8+
-ljsoncpp -ltinyxml2 -lXEngine_InfoReport -lXEngine_Verification
99
LIBEX =
1010
OBJECTS = Storage_TaskPass.o Storage_TaskManage.o Storage_TaskP2p.o Storage_TaskAction.o \
1111
StorageApp_Config.o StorageApp_HTTPHelp.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o StorageApp_Webdav.o XEngine_StorageApp.o
@@ -32,6 +32,11 @@ endif
3232
ifeq ($(PLATFORM),linux)
3333
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
3434
PLATVER = -D __CENTOS__
35+
36+
CENTOS_VERSION := $(shell grep -w "VERSION_ID" /etc/os-release | cut -d '"' -f 2 | cut -d '.' -f 1)
37+
ifeq ($(CENTOS_VERSION),10)
38+
LIB += -lmongoc2
39+
endif
3540
else
3641
PLATVER = -D __UBUNTU__
3742
endif

0 commit comments

Comments
 (0)