Makefile package command and travis github releases #416

Korijn · 2019-12-24T13:25:19Z

Closes #414

Approach mostly mimicked from gfx-portability as recommended to me by @kvark. I needed a number of commits to iron out some kinks for the Windows builds, so I would recommend using squash merge when accepting this PR.

Note that the Windows rust=nightly build fails, but it's also broken on master, so it's unrelated to the changes in this PR.

/cc @almarklein

Questions

Would it make sense to also regenerate the ffi/wgpu.h and wgpu-remote.h header files and include them in the zip archive?

Todo for maintainers

Configure encrypted api_key
As in gfx-portability you will need to create an API key and commit it to the .travis.yml file. I've checked "allow edits from maintainers" so you should be able to commit to this branch directly. You may want to reference the Travis instructions as well.
Tag revisions
Previous versions (v0.1 - v0.4) have not been tagged on the master branch, you will want to do so retroactively. Also, when releasing in the future, make sure to tag the commit before pushing. Alternatively, you can schedule a travis build manually after applying the tag retroactively.

kvark · 2019-12-26T00:58:56Z

Would it make sense to also regenerate the ffi/wgpu.h and wgpu-remote.h header files and include them in the zip archive?

They are versioned, so no need to re-generate. But they definitely need to be included in the archive!

kvark · 2019-12-26T01:00:30Z

Makefile

 lib-remote: Cargo.lock wgpu-remote/Cargo.toml $(WILDCARD_WGPU_REMOTE)
 	cargo build --manifest-path wgpu-remote/Cargo.toml

+lib-remote-release: Cargo.lock wgpu-remote/Cargo.toml $(WILDCARD_WGPU_REMOTE)


Let's not bother with packaging the "lib-remote" thing, at least for now. It's not clear how this will be evolving for now.

Alright, I'll take it out. I wasn't really sure about that. Merry xmas btw!

kvark · 2019-12-26T01:05:39Z

@grovesNL can we use the same API key that you set up for gfx-portability?

Korijn · 2019-12-27T21:06:23Z

Just pushed two commits to address your review comments.

I think the binaries have a different naming scheme on Windows, so I think the expression ./target/$$RELEASE/libwgpu_*.$(LIB_EXTENSION) is not matching anything right now... I won't have access to a Windows machine with Rust installed until later next week. If anyone knows the right filename I can fix it sooner.

We still need the API key as well.

almarklein · 2019-12-27T21:52:19Z

If anyone knows the right filename I can fix it sooner.

On my (Windows 10) machine it's target\release\wgpu_native.dll

Correct filename expression for binaries on Windows

Korijn · 2019-12-28T09:55:53Z

That fixed it, thanks @almarklein! All packages now contain the right files.

kvark · 2019-12-30T14:55:04Z

Blocked on @grovesNL and #425

grovesNL · 2019-12-30T15:27:16Z

@kvark Yeah, using the same API key as portability should be fine

@grovesNL

Usage OK'd by @grovesNL

Korijn · 2019-12-30T16:32:11Z

Done. Then I think we're just about done here, aside from #425 and adding tags to the master branch

@almarklein I'll do a nightly release on my fork once this PR is merged, so we can start consuming the github release archives, while we wait for the next release of this official repo

kvark · 2019-12-30T19:23:47Z

Bors r+

…

On Dec 30, 2019, at 11:32, Korijn van Golen ***@***.***> wrote: Done. Then I think we're just about done here, aside from #425 — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or unsubscribe.

@kvark

416: Makefile package command and travis github releases r=kvark a=Korijn Closes #414 Approach mostly mimicked from [gfx-portability](https://github.com/gfx-rs/portability) as recommended to me by @kvark. I needed a number of commits to iron out some kinks for the Windows builds, so I would recommend using squash merge when accepting this PR. Note that the Windows rust=nightly build fails, but it's also broken on master, so it's unrelated to the changes in this PR. /cc @almarklein # Questions - [x] Would it make sense to also regenerate the `ffi/wgpu.h` and `wgpu-remote.h` header files and include them in the zip archive? # Todo for maintainers - [x] Configure encrypted `api_key` As in [gfx-portability](https://github.com/gfx-rs/portability/blob/master/.travis.yml#L61) you will need to create an API key and commit it to the `.travis.yml` file. I've checked "allow edits from maintainers" so you should be able to commit to this branch directly. You may want to reference the [Travis instructions](https://docs.travis-ci.com/user/deployment/releases/#authenticating-with-an-oauth-token) as well. - [ ] Tag revisions Previous versions (`v0.1` - `v0.4`) have not been tagged on the master branch, you will want to do so retroactively. Also, when releasing in the future, make sure to tag the commit before pushing. Alternatively, you can schedule a travis build manually after applying the tag retroactively. 420: Make Origin3d::{x,y,z} all have type u32 r=kvark a=fintelia Fixes #419 424: swapchain creation: check if selected present mode is supported r=kvark a=Veykril Implements a simple check as talked about in #350 to fallback to `FIFO` should the selected present mode not be available on the system. Co-authored-by: Korijn van Golen <k.vangolen@clinicalgraphics.com> Co-authored-by: Korijn van Golen <korijn@gmail.com> Co-authored-by: Jonathan Behrens <fintelia@gmail.com> Co-authored-by: Veykril <lukastw97@gmail.com>

bors · 2019-12-30T20:01:45Z

Build succeeded

continuous-integration/travis-ci/push

kvark · 2019-12-30T23:19:43Z

@Korijn @grovesNL would it be possible to avoid making any "mozilla-xxx" tags to be triggering packaged builds?

Korijn · 2019-12-31T08:23:40Z

I figured that was what this line is for:

condition: $TRAVIS_RUST_VERSION == "stable" && $TRAVIS_BRANCH == $TRAVIS_TAG

See https://docs.travis-ci.com/user/environment-variables/#default-environment-variables

TRAVIS_BRANCH:
for push builds, or builds not triggered by a pull request, this is the name of the branch.
for builds triggered by a pull request this is the name of the branch targeted by the pull request.
for builds triggered by a tag, this is the same as the name of the tag (TRAVIS_TAG)

I just tried this on my fork, it definitely works. I added a tag v0.5dev to the latest commit on master and ran git push --tags and that triggered a build + deploy to github releases.

Korijn · 2020-01-02T07:29:20Z

@kvark updated my post above to explain how it works. Tried it on my fork with success:

https://github.com/Korijn/wgpu/releases

Build here:
https://travis-ci.org/Korijn/wgpu/builds/631764157

416: Allow trailing comma in vertex_attr_array! r=cwfitzgerald a=benfrankel Co-authored-by: Ben Frankel <ben.frankel7@gmail.com>

Korijn added 5 commits December 24, 2019 14:19

makefile package command and travis deploy step

ad797cb

make package command repeatable (useful outside of CI)

e434aed

support 7z for travis windows environment (its preinstalled)

7b93bf1

only make packages for rust stable

0a30650

explicitly set -tzip for 7z

539751d

kvark reviewed Dec 26, 2019

View reviewed changes

Korijn added 2 commits December 27, 2019 22:01

Don't release lib-remote

bf65d6d

include FFI header files in package

62175d5

Update Makefile

2beaaaf

Correct filename expression for binaries on Windows

almarklein mentioned this pull request Dec 28, 2019

Make things work on Linux and OS X pygfx/wgpu-py#8

Closed

Copy API key from gfx-portability

52de829

Usage OK'd by @grovesNL

bors bot merged commit 52de829 into gfx-rs:master Dec 30, 2019

Korijn deleted the binary-release branch December 30, 2019 20:04

Korijn mentioned this pull request Jan 2, 2020

Ship with binary libs in our wheels pygfx/wgpu-py#11

Closed

kvark pushed a commit to kvark/wgpu that referenced this pull request Jun 3, 2021

[rs] Merge gfx-rs#416

7c1f090

416: Allow trailing comma in vertex_attr_array! r=cwfitzgerald a=benfrankel Co-authored-by: Ben Frankel <ben.frankel7@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Makefile package command and travis github releases #416

Makefile package command and travis github releases #416

Korijn commented Dec 24, 2019 •

edited

Loading

kvark commented Dec 26, 2019

kvark Dec 26, 2019

Korijn Dec 26, 2019 •

edited

Loading

kvark commented Dec 26, 2019

Korijn commented Dec 27, 2019 •

edited

Loading

almarklein commented Dec 27, 2019

Korijn commented Dec 28, 2019

kvark commented Dec 30, 2019

grovesNL commented Dec 30, 2019

Korijn commented Dec 30, 2019 •

edited

Loading

kvark commented Dec 30, 2019 via email

bors bot commented Dec 30, 2019

kvark commented Dec 30, 2019

Korijn commented Dec 31, 2019 •

edited

Loading

Korijn commented Jan 2, 2020 •

edited

Loading

Makefile package command and travis github releases #416

Makefile package command and travis github releases #416

Conversation

Korijn commented Dec 24, 2019 • edited Loading

Questions

Todo for maintainers

kvark commented Dec 26, 2019

kvark Dec 26, 2019

Choose a reason for hiding this comment

Korijn Dec 26, 2019 • edited Loading

Choose a reason for hiding this comment

kvark commented Dec 26, 2019

Korijn commented Dec 27, 2019 • edited Loading

almarklein commented Dec 27, 2019

Korijn commented Dec 28, 2019

kvark commented Dec 30, 2019

grovesNL commented Dec 30, 2019

Korijn commented Dec 30, 2019 • edited Loading

kvark commented Dec 30, 2019 via email

bors bot commented Dec 30, 2019

Build succeeded

kvark commented Dec 30, 2019

Korijn commented Dec 31, 2019 • edited Loading

Korijn commented Jan 2, 2020 • edited Loading

Korijn commented Dec 24, 2019 •

edited

Loading

Korijn Dec 26, 2019 •

edited

Loading

Korijn commented Dec 27, 2019 •

edited

Loading

Korijn commented Dec 30, 2019 •

edited

Loading

Korijn commented Dec 31, 2019 •

edited

Loading

Korijn commented Jan 2, 2020 •

edited

Loading