diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 44ca24b..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,25 +0,0 @@ -os: - - Visual Studio 2017 - #- Visual Studio 2015 - -platform: - - Win32 - - x64 - -configuration: - #- Debug - - Release - -skip_commits: - files: - - '**/*.md' - -before_build: - - git clone --depth=1 https://github.com/KhronosGroup/OpenCL-Headers external/OpenCL-Headers - - git clone --depth=1 https://github.com/KhronosGroup/OpenCL-ICD-Loader external/opencl-icd-loader - - cmake -H. -Bbuild -A%PLATFORM% - -build: - project: build\SimpleOpenCLSamples.sln - parallel: true - verbosity: normal diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8cd5f8a..4760939 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,8 +33,17 @@ jobs: strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, ubuntu-24.04-arm] ext: [YES, NO] + include: + - { os: windows-latest, windows-arch: x64, ext: YES } + - { os: windows-latest, windows-arch: x64, ext: NO } + - { os: windows-latest, windows-arch: Win32, ext: YES } + - { os: windows-latest, windows-arch: Win32, ext: NO } + - { os: windows-11-arm, windows-arch: ARM64, ext: YES } + - { os: windows-11-arm, windows-arch: ARM64, ext: NO } + - { os: windows-11-arm, windows-arch: ARM64EC, ext: YES } + - { os: windows-11-arm, windows-arch: ARM64EC, ext: NO } runs-on: ${{matrix.os}} @@ -74,19 +83,24 @@ jobs: path: external/SPIRV-Headers - name: Create Build Directory - run: cmake -E make_directory ${{runner.workspace}}/build + run: cmake -E make_directory ./build - name: Run CMake shell: bash - working-directory: ${{runner.workspace}}/build - run: cmake -DOpenCL_INCLUDE_DIRS=$GITHUB_WORKSPACE/external/OpenCL-Headers -DCMAKE_BUILD_TYPE=$BUILD_TYPE $GITHUB_WORKSPACE + working-directory: ./build + run: | + if [[ -n "${{ matrix.windows-arch }}" ]]; then + cmake -DOpenCL_INCLUDE_DIRS=$GITHUB_WORKSPACE/external/OpenCL-Headers -DCMAKE_BUILD_TYPE=$BUILD_TYPE -A ${{ matrix.windows-arch }} $GITHUB_WORKSPACE + else + cmake -DOpenCL_INCLUDE_DIRS=$GITHUB_WORKSPACE/external/OpenCL-Headers -DCMAKE_BUILD_TYPE=$BUILD_TYPE $GITHUB_WORKSPACE + fi - name: Build - working-directory: ${{runner.workspace}}/build + working-directory: ./build shell: bash run: cmake --build . --parallel --config $BUILD_TYPE #- name: Test - # working-directory: ${{runner.workspace}}/build + # working-directory: ./build # shell: bash # run: ctest -C $BUILD_TYPE diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7975d9d..0000000 --- a/.travis.yml +++ /dev/null @@ -1,19 +0,0 @@ -language: cpp - -compiler: - - gcc - - clang - -os: - - linux - #- osx - -before_install: - - git clone https://github.com/KhronosGroup/OpenCL-Headers external/OpenCL-Headers - - git clone https://github.com/KhronosGroup/OpenCL-ICD-Loader external/opencl-icd-loader - -script: - - mkdir -p build - - cd build - - cmake .. - - make