alex/ash-molten
1
0
Fork 0
mirror of https://github.com/italicsjenga/ash-molten.git synced 2024-12-23 13:21:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

MoltenVK 1.1.3 #feb8d41 (#58)

Browse source 
* patch feb8d41

* Update to macos 11

* Update xcode path

* Forgot 1 xcode path

* Also forgot a macos-latest

Co-authored-by: Jake Shadle <jake.shadle@embark-studios.com>
This commit is contained in:
Viktor Zoutman 2021-07-26 13:06:53 +02:00 committed by GitHub
parent e3030ae381
commit 98697e2620
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/ci.yaml vendored
View file

@ -8,9 +8,9 @@ name: CI
jobs: jobs:
lint: lint:
name: Lint name: Lint
runs-on: macos-latest runs-on: macos-11
env: env:
DEVELOPER_DIR: /Applications/Xcode_12.1.app DEVELOPER_DIR: /Applications/Xcode_12.5.app
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
@ -33,9 +33,9 @@ jobs:
test-source: test-source:
name: Test (source build) name: Test (source build)
runs-on: macos-latest runs-on: macos-11
env: env:
DEVELOPER_DIR: /Applications/Xcode_12.1.app DEVELOPER_DIR: /Applications/Xcode_12.5.app
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
@ -47,9 +47,9 @@ jobs:
test: test:
name: Test (pre-built) name: Test (pre-built)
runs-on: macos-latest runs-on: macos-11
env: env:
DEVELOPER_DIR: /Applications/Xcode_12.1.app DEVELOPER_DIR: /Applications/Xcode_12.5.app
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1

2
Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "ash-molten" name = "ash-molten"
description = "Statically linked MoltenVK for Vulkan on Mac using Ash" description = "Statically linked MoltenVK for Vulkan on Mac using Ash"
version = "0.9.0+1.1.2-f28ab1c" version = "0.10.0+1.1.3-feb8d41"
authors = ["Embark <opensource@embark-studios.com>", "Maik Klein <maik.klein@embark-studios.com>"] authors = ["Embark <opensource@embark-studios.com>", "Maik Klein <maik.klein@embark-studios.com>"]
edition = "2018" edition = "2018"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"

4
build/build.rs
View file

@ -61,8 +61,8 @@ mod mac {
use std::path::Path; use std::path::Path;
// MoltenVK git tagged release to use // MoltenVK git tagged release to use
pub static MOLTEN_VK_VERSION: &str = "1.1.2"; pub static MOLTEN_VK_VERSION: &str = "1.1.3";
pub static MOLTEN_VK_PATCH: Option<&str> = Some("f28ab1c"); pub static MOLTEN_VK_PATCH: Option<&str> = Some("feb8d41");
// Return the artifact tag in the form of "x.x.x" or if there is a patch specified "x.x.x#yyyyyyy" // Return the artifact tag in the form of "x.x.x" or if there is a patch specified "x.x.x#yyyyyyy"
pub(crate) fn get_artifact_tag() -> String { pub(crate) fn get_artifact_tag() -> String {