Skip to content

Commit def62d5

Browse files
committed
ci:update mac build
1 parent b8b95e2 commit def62d5

3 files changed

Lines changed: 8 additions & 11 deletions

File tree

‎.github/workflows/macbuild.yml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ jobs:
1717
strategy:
1818
matrix:
1919
include:
20-
- os: macos-15
21-
- os: macos-15-intel
2220
- os: macos-26
2321
- os: macos-26-intel
2422
runs-on: ${{ matrix.os }}
@@ -41,20 +39,17 @@ jobs:
4139
git submodule init
4240
git submodule update
4341
44-
- name: brew install
45-
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
46-
4742
- name: Set TERM variable
4843
run: echo "TERM=xterm" >> $GITHUB_ENV
4944

5045
- name: Set up Dependency x86_64 Environment
51-
if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-26-intel'
46+
if: matrix.os == 'macos-26-intel'
5247
run: |
5348
cd libxengine
5449
chmod 777 *
5550
./XEngine_LINEnv.sh -i 3
5651
- name: Set up Dependency Arm64 Environment
57-
if: matrix.os == 'macos-15' || matrix.os == 'macos-26'
52+
if: matrix.os == 'macos-26'
5853
run: |
5954
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)
6055
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Mac_Arm64.zip
@@ -82,14 +77,14 @@ jobs:
8277
./XEngine_XStorageApp -t
8378
8479
- name: Upload folder as artifact with mac x64
85-
if: matrix.os == 'macos-15-intel'
80+
if: matrix.os == 'macos-26-intel'
8681
uses: actions/upload-artifact@v7
8782
with:
8883
name: XEngine_XStorageApp-Mac_x86_64
8984
path: XEngine_Release/
9085
retention-days: 1
9186
- name: Upload folder as artifact with mac arm
92-
if: matrix.os == 'macos-15'
87+
if: matrix.os == 'macos-26'
9388
uses: actions/upload-artifact@v7
9489
with:
9590
name: XEngine_XStorageApp-Mac_Arm64

‎XEngine_Source/VSCopy_Arm64.bat‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ copy /y "%XEngine_LibArm64%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
1616

1717
copy /y "%XEngine_LibArm64%\XEngine_HelpComponents\HelpComponents_DataBase.dll" "./"
1818
copy /y "%XEngine_LibArm64%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"
19-
copy /y "%XEngine_LibArm64%\XEngine_RfcComponents\RfcComponents_HttpProtocol.dll" "./"
19+
copy /y "%XEngine_LibArm64%\XEngine_RfcComponents\RfcComponents_HttpProtocol.dll" "./"
20+
copy /y "%XEngine_LibArm64%\XEngine_RfcComponents\RfcComponents_FTPProtocol.dll" "./"

‎XEngine_Source/VSCopy_x64.bat‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
1616

1717
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_DataBase.dll" "./"
1818
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"
19-
copy /y "%XEngine_Lib64%\XEngine_RfcComponents\RfcComponents_HttpProtocol.dll" "./"
19+
copy /y "%XEngine_Lib64%\XEngine_RfcComponents\RfcComponents_HttpProtocol.dll" "./"
20+
copy /y "%XEngine_Lib64%\XEngine_RfcComponents\RfcComponents_FTPProtocol.dll" "./"

0 commit comments

Comments
 (0)