Skip to content

Commit

Permalink
Incremented version to 1.7.6.
Browse files Browse the repository at this point in the history
Updated SPIRV-Cross, SPIRV-Tools, and glslang to the latest release
versions. Updated boost and gtest versions used in CI.
  • Loading branch information
akb825 committed Nov 11, 2024
1 parent 1d4cb19 commit 1efa3e4
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ on:
env:
CTEST_OUTPUT_ON_FAILURE: '1'
GTEST_OUTPUT: xml:${{ github.workspace }}/test-results/
boost_version: 1.84.0
boost_version: 1.86.0
cmake_common_args: >-
-DCMAKE_FIND_ROOT_PATH=${{ github.workspace }}/dependencies
-DCMAKE_PREFIX_PATH=${{ github.workspace }}/dependencies
cores_count: '4'
cores_mac_count: '3'
dependency_location: "${{ github.workspace }}/dependencies"
gtest_version: release-1.12.1
gtest_version: v1.15.2
msvc_version: 14.2
msvc_toolset: 142
test_results_location: "${{ github.workspace }}/test-results"
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
- name: Publish test results
uses: EnricoMi/publish-unit-test-result-action/macos@v2
with:
check_name: Tests( Mac ${{ matrix.lib_type }} Debug)
check_name: Tests (Mac ${{ matrix.lib_type }} Debug)
junit_files: "${{ env.test_results_location }}/*.xml"
- name: Clear test results
run: rm *.xml
Expand All @@ -155,7 +155,7 @@ jobs:
- name: Publish test results
uses: EnricoMi/publish-unit-test-result-action/macos@v2
with:
check_name: Mac-${{ matrix.lib_type }}-Release
check_name: Mac (${{ matrix.lib_type }} Release)
junit_files: "${{ env.test_results_location }}/*.xml"
Windows:
runs-on: windows-latest
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
max_attempts: 5
command: |-
$underscoreVersion = "${{ env.boost_version }}".replace(".", "_")
$url = "https://sourceforge.net/projects/boost/files/boost-binaries/${{ env.boost_version }}/boost_$underscoreVersion-msvc-${{ env.msvc_version }}-${{ matrix.bits }}.exe"
$url = "https://versaweb.dl.sourceforge.net/project/boost/boost-binaries/${{ env.boost_version }}/boost_$underscoreVersion-msvc-${{ env.msvc_version }}-${{ matrix.bits }}.exe"
(New-Object System.Net.WebClient).DownloadFile($url, "$env:TEMP\boost.exe")
Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=D:\boost"
- name: Checkout gtest
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ endif()

set(MSL_MAJOR_VERSION 1)
set(MSL_MINOR_VERSION 7)
set(MSL_PATCH_VERSION 5)
set(MSL_PATCH_VERSION 6)
set(MSL_VERSION ${MSL_MAJOR_VERSION}.${MSL_MINOR_VERSION}.${MSL_PATCH_VERSION})

set(MSL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
Expand Down
2 changes: 1 addition & 1 deletion Compile/SPIRV-Cross
Submodule SPIRV-Cross updated 225 files
2 changes: 1 addition & 1 deletion Compile/SPIRV-Tools
Submodule SPIRV-Tools updated 120 files
2 changes: 1 addition & 1 deletion Compile/glslang
Submodule glslang updated 758 files
1 change: 0 additions & 1 deletion Compile/include/MSL/Compile/TargetMetal.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <MSL/Config.h>
#include <MSL/Compile/Export.h>
#include <MSL/Compile/Target.h>
#include <map>

/**
* @file
Expand Down

0 comments on commit 1efa3e4

Please sign in to comment.