Skip to content

Commit

Permalink
Merge pull request #1 from 2gis/macos-arm-build
Browse files Browse the repository at this point in the history
Macos arm build
  • Loading branch information
KaperD authored Jul 5, 2024
2 parents e6dbba1 + 882e106 commit 89eb793
Showing 1 changed file with 23 additions and 63 deletions.
86 changes: 23 additions & 63 deletions .github/workflows/build_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,6 @@ jobs:
name: astcenc-linux-x64
path: build_rel/*.zip

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Get Python modules
run: |
python -m pip install --upgrade pip
pip install numpy Pillow
- name: Python Tests
run: |
python ./Test/astc_test_functional.py --encoder=none
python ./Test/astc_test_functional.py --encoder=sse2
python ./Test/astc_test_functional.py --encoder=sse4.1
python ./Test/astc_test_functional.py --encoder=avx2
python ./Test/astc_test_image.py --encoder=none --test-set Small --test-quality medium
python ./Test/astc_test_image.py --encoder=all-x86 --test-set Small --test-quality medium
- name: ctest
run: ctest
working-directory: build_rel

build-macos:
name: Build and test on MacOS
runs-on: macos-12
Expand Down Expand Up @@ -89,19 +66,34 @@ jobs:
name: astcenc-macos-x64
path: build_rel/*.zip

- name: Setup Python
uses: actions/setup-python@v4
build-macos-arm:
name: Build and test on MacOS Arm
runs-on: macos-14
steps:
- name: Git checkout
uses: actions/checkout@v4
with:
python-version: '3.11'
submodules: 'true'

- name: Get Python modules
- name: Build R
run: |
python -m pip install --upgrade pip
pip install numpy Pillow
mkdir build_rel
cd build_rel
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../ -DASTCENC_UNIVERSAL_BUILD=OFF -DASTCENC_ISA_NEON=ON -DASTCENC_PACKAGE=arm ..
make install package -j4
- name: Python Tests
- name: Build D
run: |
python ./Test/astc_test_image.py --test-set Small --test-quality medium
mkdir build_dbg
cd build_dbg
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DASTCENC_UNIVERSAL_BUILD=OFF -DASTCENC_ISA_NEON=ON ..
make -j4
- name: Upload binaries
uses: actions/upload-artifact@v3
with:
name: astcenc-macos-arm
path: build_rel/*.zip

build-windows-msvc:
name: Build and test on Windows MSVC
Expand Down Expand Up @@ -137,22 +129,6 @@ jobs:
name: astcenc-windows-x64-cl
path: build_rel/*.zip

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Get Python modules
run: |
python -m pip install --upgrade pip
pip install numpy Pillow
shell: cmd

- name: Python Tests
run: |
python ./Test/astc_test_image.py --test-set Small --test-quality medium
shell: cmd

build-windows-ClangCL:
name: Build and test on Windows ClangCL
runs-on: windows-2022
Expand Down Expand Up @@ -188,19 +164,3 @@ jobs:
with:
name: astcenc-windows-x64-clangcl
path: build_rel/*.zip

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Get Python modules
run: |
python -m pip install --upgrade pip
pip install numpy Pillow
shell: cmd

- name: Python Tests
run: |
python ./Test/astc_test_image.py --test-set Small --test-quality medium
shell: cmd

0 comments on commit 89eb793

Please sign in to comment.