Skip to content

Commit

Permalink
Update to ensure that version is exported (#2)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] authored Sep 17, 2023
2 parents 0614c30 + 97b351f commit 9619244
Show file tree
Hide file tree
Showing 11 changed files with 132 additions and 41 deletions.
8 changes: 8 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_arch:
- aarch64
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
rust_compiler:
- rust
target_platform:
- linux-aarch64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
23 changes: 23 additions & 0 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
rust_compiler:
- rust
target_platform:
- linux-ppc64le
zip_keys:
- - c_compiler_version
- cxx_compiler_version
25 changes: 25 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '12.3'
c_compiler:
- clang
c_compiler_version:
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
macos_machine:
- arm64-apple-darwin20.0.0
rust_compiler:
- rust
target_platform:
- osx-arm64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
21 changes: 21 additions & 0 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,13 @@ github:
conda_build:
error_overlinking: true
conda_forge_output_validation: true
build_platform:
linux_aarch64: linux_64
linux_ppc64le: linux_64
osx_arm64: osx_64
provider:
linux_aarch64: azure
linux_ppc64le: azure
bot:
abi_migration_branches:
- 0.14
3 changes: 2 additions & 1 deletion recipe/bld.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@ECHO ON

copy %PREFIX%\\Library\\include\\webgpu.h ffi\\webgpu.h
set WGPU_NATIVE_VERSION=v%PKG_VERSION%
copy %PREFIX%\\Library\\include\\webgpu.h ffi\\webgpu-headers\\webgpu.h

cargo-bundle-licenses --format yaml --output THIRDPARTY.yml
if %ERRORLEVEL% neq 0 exit 1
Expand Down
13 changes: 11 additions & 2 deletions recipe/build.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
set -ex
export WGPU_NATIVE_VERSION=v${PKG_VERSION}
export CARGO_PKG_VERSION=${PKG_VERSION}
cargo-bundle-licenses --format yaml --output THIRDPARTY.yml

cp ${PREFIX}/include/webgpu.h ffi/webgpu.h
cp ${PREFIX}/include/webgpu.h ffi/webgpu-headers/webgpu.h

cargo build --release --all-features
CARGO_TARGET="${HOST}"
CARGO_TARGET="$(echo -n ${CARGO_TARGET} | sed "s/conda/unknown/")"
CARGO_TARGET="$(echo -n ${CARGO_TARGET} | sed "s/darwin.*/darwin/")"
CARGO_TARGET="$(echo -n ${CARGO_TARGET} | sed "s/arm64/aarch64/")"

cargo build \
--release \
--all-features \
--target ${CARGO_TARGET}

rm target/CACHEDIR.TAG
rm -rf target/release
Expand Down
6 changes: 2 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ package:
source:
url: https://github.com/gfx-rs/{{ name }}/archive/refs/tags/v{{ version }}.tar.gz
sha256: d84de1dd26295cc0a6fdfc150e3018bda755b7620a1e8950edc96ecb5c2e4eef
patches:
- use_prefix.patch

build:
number: 0
number: 1
run_exports:
# hmaarrfk: 2023/07/29 -- No clue ....
- {{ pin_subpackage('wgpu-native', max_pin='x.x.x') }}
Expand All @@ -27,7 +25,7 @@ requirements:
- pkg-config
- clangdev
host:
- webgpu-headers
- webgpu-headers 0.0.0.2023.06
- clangdev

test:
Expand Down
34 changes: 0 additions & 34 deletions recipe/use_prefix.patch

This file was deleted.

0 comments on commit 9619244

Please sign in to comment.