Merge branch 'crates.io' into 'master'
Draft: publish to crates.io See merge request videolan/vlc-rs!14merge-requests/14/merge
						commit
						ed25b7ae6e
					
				| 
						 | 
					@ -1,5 +1,6 @@
 | 
				
			||||||
stages:
 | 
					stages:
 | 
				
			||||||
    - build
 | 
					    - build
 | 
				
			||||||
 | 
					    - deploy
 | 
				
			||||||
 | 
					
 | 
				
			||||||
variables:
 | 
					variables:
 | 
				
			||||||
    VLC_UBUNTU_IMAGE: registry.videolan.org/vlc-rs-libvlc-stable-ubuntu:20211117143343
 | 
					    VLC_UBUNTU_IMAGE: registry.videolan.org/vlc-rs-libvlc-stable-ubuntu:20211117143343
 | 
				
			||||||
| 
						 | 
					@ -15,3 +16,23 @@ vlc-rs-build:
 | 
				
			||||||
    script:
 | 
					    script:
 | 
				
			||||||
        - . $CARGO_HOME/env
 | 
					        - . $CARGO_HOME/env
 | 
				
			||||||
        - cargo build --all
 | 
					        - cargo build --all
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vlc-rs-deploy:
 | 
				
			||||||
 | 
					    tags:
 | 
				
			||||||
 | 
					        - docker
 | 
				
			||||||
 | 
					        - amd64
 | 
				
			||||||
 | 
					    stage: deploy
 | 
				
			||||||
 | 
					    image:
 | 
				
			||||||
 | 
					        name: $VLC_UBUNTU_IMAGE
 | 
				
			||||||
 | 
					    variables:
 | 
				
			||||||
 | 
					    #    CARGO_TOKEN: $CARGO_TOKEN
 | 
				
			||||||
 | 
					    rules:
 | 
				
			||||||
 | 
					        - if: '$CI_COMMIT_TAG =~ /^(\d+\.)?(\d+\.)?(\*|\d+)/'
 | 
				
			||||||
 | 
					    script:
 | 
				
			||||||
 | 
					        - . $CARGO_HOME/env
 | 
				
			||||||
 | 
					        # - cargo publish --token "$CARGO_TOKEN"
 | 
				
			||||||
 | 
					        - cargo publish --dry-run
 | 
				
			||||||
 | 
					    artifacts:
 | 
				
			||||||
 | 
					        name: "${CI_COMMIT_TAG}"
 | 
				
			||||||
 | 
					        paths:
 | 
				
			||||||
 | 
					            - target/package/vlc-rs-*.crate
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,6 @@
 | 
				
			||||||
[package]
 | 
					[package]
 | 
				
			||||||
name = "vlc-rs"
 | 
					name = "vlc-rs"
 | 
				
			||||||
version = "0.3.0"
 | 
					version = "0.4.0"
 | 
				
			||||||
authors = ["T. Okubo <t.okubo.rx78+github@gmail.com>"]
 | 
					authors = ["T. Okubo <t.okubo.rx78+github@gmail.com>"]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
description = "Rust bindings for libVLC media framework."
 | 
					description = "Rust bindings for libVLC media framework."
 | 
				
			||||||
| 
						 | 
					@ -19,8 +19,5 @@ crate-type = ["rlib"]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[dependencies]
 | 
					[dependencies]
 | 
				
			||||||
libc = "0.2"
 | 
					libc = "0.2"
 | 
				
			||||||
libvlc-sys = { path = "libvlc-sys" }
 | 
					libvlc-sys = { version = "0.2.0", path = "libvlc-sys" }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[features]
 | 
					 | 
				
			||||||
default = []
 | 
					 | 
				
			||||||
use-bindgen = ["libvlc-sys/use-bindgen"]
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -21,12 +21,8 @@ crate-type = ["rlib"]
 | 
				
			||||||
libc = "0.2"
 | 
					libc = "0.2"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[build-dependencies]
 | 
					[build-dependencies]
 | 
				
			||||||
bindgen = {version = "0.59", optional = true }
 | 
					bindgen = {version = "0.59"}
 | 
				
			||||||
pkg-config = "0.3"
 | 
					pkg-config = "0.3"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[target.'cfg(target_os = "windows")'.build-dependencies]
 | 
					[target.'cfg(target_os = "windows")'.build-dependencies]
 | 
				
			||||||
vswhom = "0.1.0"
 | 
					vswhom = "0.1.0"
 | 
				
			||||||
 | 
					 | 
				
			||||||
[features]
 | 
					 | 
				
			||||||
default = []
 | 
					 | 
				
			||||||
use-bindgen = ["bindgen"]
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue