Merge branch 'main' into main

This commit is contained in:
PrimedErwin 2025-05-15 16:40:25 +08:00 committed by GitHub
commit 8f35fb1b64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 31 deletions

View File

@ -36,7 +36,7 @@ jobs:
shell: bash shell: bash
run: | run: |
mkdir -p output/x86_64 mkdir -p output/x86_64
python cmake_build.py python cmake_build.py Release -DPK_BUILD_MODULE_LZ4=ON
cp main.exe output/x86_64 cp main.exe output/x86_64
cp pocketpy.dll output/x86_64 cp pocketpy.dll output/x86_64
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
@ -70,7 +70,7 @@ jobs:
run: | run: |
python scripts/check_pragma_once.py include python scripts/check_pragma_once.py include
mkdir -p output/x86_64 mkdir -p output/x86_64
python cmake_build.py python cmake_build.py Release -DPK_BUILD_MODULE_LZ4=ON
python scripts/run_tests.py python scripts/run_tests.py
cp main output/x86_64 cp main output/x86_64
cp libpocketpy.so output/x86_64 cp libpocketpy.so output/x86_64
@ -82,33 +82,6 @@ jobs:
path: output path: output
- name: Benchmark - name: Benchmark
run: python scripts/run_tests.py benchmark run: python scripts/run_tests.py benchmark
build_linux_x86:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup Alpine Linux for aarch64
uses: jirutka/setup-alpine@v1
with:
arch: x86
packages: gcc g++ make cmake libc-dev linux-headers python3 gdb
- name: Build and Test
run: |
uname -m
python -c "import struct; print(8 * struct.calcsize('P'))"
# python cmake_build.py Debug
# # gdb_commands.txt
# echo "run" > gdb_commands.txt
# echo "backtrace" >> gdb_commands.txt
# echo "quit" >> gdb_commands.txt
# gdb -batch -x gdb_commands.txt --args ./main tests/77_builtin_func_1.py
python cmake_build.py
python scripts/run_tests.py
python scripts/run_tests.py benchmark
shell: alpine.sh --root {0}
build_darwin: build_darwin:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
@ -117,7 +90,7 @@ jobs:
submodules: true submodules: true
- name: Compile and Test - name: Compile and Test
run: | run: |
python cmake_build.py python cmake_build.py Release -DPK_BUILD_MODULE_LZ4=ON
python scripts/run_tests.py python scripts/run_tests.py
- name: Benchmark - name: Benchmark
run: python scripts/run_tests.py benchmark run: python scripts/run_tests.py benchmark
@ -170,6 +143,29 @@ jobs:
with: with:
name: ios name: ios
path: output path: output
build_linux_multiarch:
runs-on: ubuntu-latest
strategy:
matrix:
arch: [x86, aarch64, armv7]
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup Alpine Linux for ${{ matrix.arch }}
uses: jirutka/setup-alpine@v1
with:
arch: ${{ matrix.arch }}
packages: gcc g++ make cmake libc-dev linux-headers python3
- name: Build and Test
run: |
echo "Building for architecture: ${{ matrix.arch }}"
uname -m
python -c "import struct; print(8 * struct.calcsize('P'))"
python cmake_build.py
python scripts/run_tests.py
shell: alpine.sh --root {0}
merge: merge:
runs-on: ubuntu-latest runs-on: ubuntu-latest

View File

@ -20,7 +20,7 @@ assert config in ['Debug', 'Release', 'RelWithDebInfo']
os.chdir("build") os.chdir("build")
code = os.system(f"cmake .. -DPK_ENABLE_OS=ON -DPK_BUILD_MODULE_LZ4=OFF -DPK_ENABLE_DETERMINISTIC_FLOAT=ON -DCMAKE_BUILD_TYPE={config} {extra_flags}") code = os.system(f"cmake .. -DPK_ENABLE_OS=ON -DCMAKE_BUILD_TYPE={config} {extra_flags}")
assert code == 0 assert code == 0
code = os.system(f"cmake --build . --config {config} -j 4") code = os.system(f"cmake --build . --config {config} -j 4")
assert code == 0 assert code == 0