Skip to content

Commit 4c435b5

Browse files
enfipyenfipy
committed
Fix CI and bump version
1 parent 9080ed6 commit 4c435b5

File tree

12 files changed

+42
-51
lines changed

12 files changed

+42
-51
lines changed

‎.github/workflows/ci.yml

-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
name: CI
2-
32
on:
43
push:
54
branches: [main]
@@ -12,9 +11,7 @@ on:
1211
- '.github/workflows/ci.yml'
1312
- '**.rs'
1413
- '**.toml'
15-
1614
jobs:
17-
1815
android-build-ubuntu:
1916
name: Build Android example on Ubuntu latest
2017
runs-on: ubuntu-latest

‎.github/workflows/docker.yml

-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
name: Docker images
2-
32
on:
43
push:
54
branches: [main]
65
paths:
76
- '.github/docker/*.Dockerfile'
87
- '.github/workflows/docker.yml'
9-
108
jobs:
11-
129
build-crossbundle-dockerfile:
1310
name: Build Crossbundle Dockerfile
1411
runs-on: ubuntu-latest

‎.github/workflows/publish.yml

+23-26
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
21
name: Build and publish
3-
42
on:
53
push:
64
tags: ['v*']
7-
85
jobs:
9-
106
build-and-publish-to-crates-io:
117
name: Build and publish to crates.io
128
runs-on: macos-latest
@@ -39,7 +35,7 @@ jobs:
3935
- name: Install cargo make
4036
run: cargo install cargo-make
4137
- name: Build binary
42-
run: cargo make zip-release -e CARGO_MAKE_RELEASE_FLOW_TARGET=${{ matrix.binary_target }}
38+
run: cargo make -e CARGO_MAKE_RELEASE_FLOW_TARGET=${{ matrix.binary_target }} zip-release
4339
- name: Upload zip file
4440
uses: svenstaro/upload-release-action@v2
4541
with:
@@ -49,24 +45,25 @@ jobs:
4945
overwrite: true
5046
file_glob: true
5147

52-
# build-and-publish-release-examples:
53-
# name: Build and publish examples to Github release
54-
# needs: build-and-publish-to-crates-io
55-
# runs-on: macos-latest
56-
# steps:
57-
# - uses: actions/checkout@master
58-
# - name: Install cargo make
59-
# run: cargo install cargo-make
60-
# - name: Build binary
61-
# run: |
62-
# cargo install --git=https://github.com/dodorare/crossbow --branch=main crossbundle
63-
# rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
64-
# cargo make build-release-examples
65-
# - name: Upload zip file
66-
# uses: svenstaro/upload-release-action@v2
67-
# with:
68-
# repo_token: ${{ secrets.GITHUB_TOKEN }}
69-
# file: 'target/apks/*.apk'
70-
# tag: ${{ github.ref }}
71-
# overwrite: true
72-
# file_glob: true
48+
build-and-publish-release-examples:
49+
name: Build and publish examples to Github release
50+
needs: build-and-publish-to-crates-io
51+
if: false # TODO: Finish examples and enable this
52+
runs-on: macos-latest
53+
steps:
54+
- uses: actions/checkout@master
55+
- name: Install cargo make
56+
run: cargo install cargo-make
57+
- name: Build binary
58+
run: |
59+
cargo install --git=https://github.com/dodorare/crossbow --branch=main crossbundle
60+
rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
61+
cargo make build-release-examples
62+
- name: Upload zip file
63+
uses: svenstaro/upload-release-action@v2
64+
with:
65+
repo_token: ${{ secrets.GITHUB_TOKEN }}
66+
file: 'target/apks/*.apk'
67+
tag: ${{ github.ref }}
68+
overwrite: true
69+
file_glob: true

‎Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "crossbow"
3-
version = "0.1.0"
3+
version = "0.1.1"
44
edition = "2021"
55
authors = ["DodoRare Team <support@dodorare.com>"]
66
description = "Cross-Platform Rust Toolkit for Games 🏹"
@@ -11,11 +11,11 @@ readme = "README.md"
1111
exclude = [".github/**/*"]
1212

1313
[dependencies]
14-
crossbundle-derive = { path = "crossbundle/derive", version = "0.1.0" }
15-
crossbundle-tools = { path = "crossbundle/tools", version = "0.1.0", optional = true }
14+
crossbundle-derive = { path = "crossbundle/derive", version = "0.1.1" }
15+
crossbundle-tools = { path = "crossbundle/tools", version = "0.1.1", optional = true }
1616

17-
crossbow-ads = { path = "plugins/ads", version = "0.1.0", optional = true }
18-
crossbow-permissions = { path = "plugins/permissions", version = "0.1.0", optional = true }
17+
crossbow-ads = { path = "plugins/ads", version = "0.1.1", optional = true }
18+
crossbow-permissions = { path = "plugins/permissions", version = "0.1.1", optional = true }
1919

2020
[target.'cfg(target_os = "android")'.dependencies]
2121
ndk-glue = { git = "https://github.com/rust-windowing/android-ndk-rs" }

‎crossbundle/cli/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "crossbundle"
3-
version = "0.1.0"
3+
version = "0.1.1"
44
edition = "2021"
55
authors = ["DodoRare Team <support@dodorare.com>"]
66
description = "Build and publish apps for Android/iOS"
@@ -22,9 +22,9 @@ name = "cargo-crossbundle"
2222
path = "src/main.rs"
2323

2424
[dependencies]
25-
crossbundle-tools = { path = "../tools", version = "0.1.0" }
25+
crossbundle-tools = { path = "../tools", version = "0.1.1" }
2626

27-
clap = { git = "https://github.com/clap-rs/clap", rev = "33d86effc9b34e207268977ba45c97f80b3f1b57" }
27+
clap = { version = "3.0.5", features = ["derive"] }
2828
cargo_toml = "0.10.1"
2929
serde = { version = "1.0", features = ["derive"] }
3030
dunce = "1.0"

‎crossbundle/derive/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "crossbundle-derive"
3-
version = "0.1.0"
3+
version = "0.1.1"
44
edition = "2021"
55
authors = ["DodoRare Team <support@dodorare.com>"]
66
description = "Cross-Platform Rust Toolkit for Games 🏹"

‎crossbundle/tools/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "crossbundle-tools"
3-
version = "0.1.0"
3+
version = "0.1.1"
44
edition = "2021"
55
authors = ["DodoRare Team <support@dodorare.com>"]
66
description = "Build and publish apps for Android/iOS"
@@ -32,7 +32,7 @@ zip = "0.5.13"
3232
zip-extensions = "0.6"
3333
tempfile = "3.2"
3434

35-
cargo = "0.57.0"
35+
cargo = "0.58.0"
3636
cargo-util = "0.1.1"
3737

3838
[target.'cfg(unix)'.dependencies]

‎examples/bevy-2d/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "bevy-2d"
3-
version = "0.1.0"
3+
version = "0.1.1"
44
authors = ["DodoRare Team <support@dodorare.com>"]
55
edition = "2018"
66

77
[dependencies]
8-
crossbow = { version = "0.1.0", path = "../../" }
8+
crossbow = { version = "0.1.1", path = "../../" }
99
log = "0.4"
1010
anyhow = "1.0"
1111
bevy = { version = "0.6.0", features = ["mp3"] }

‎examples/bevy-3d/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "bevy-3d"
3-
version = "0.1.0"
3+
version = "0.1.1"
44
authors = ["DodoRare Team <support@dodorare.com>"]
55
edition = "2021"
66

77
[dependencies]
8-
crossbow = { version = "0.1.0", path = "../../" }
8+
crossbow = { version = "0.1.1", path = "../../" }
99
log = "0.4"
1010
anyhow = "1.0"
1111
bevy = "0.6.0"

‎examples/macroquad-3d/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "macroquad-3d"
3-
version = "0.1.0"
3+
version = "0.1.1"
44
authors = ["DodoRare Team <support@dodorare.com>"]
55
edition = "2018"
66

77
[dependencies]
8-
crossbow = { version = "0.1.0", path = "../../" }
8+
crossbow = { version = "0.1.1", path = "../../" }
99
log = "0.4"
1010
anyhow = "1.0"
1111
macroquad = "0.3"

‎plugins/ads/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "crossbow-ads"
3-
version = "0.1.0"
3+
version = "0.1.1"
44
edition = "2021"
55
authors = ["DodoRare Team <support@dodorare.com>"]
66
description = "Cross-Platform Rust Toolkit for Games 🏹"

‎plugins/permissions/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "crossbow-permissions"
3-
version = "0.1.0"
3+
version = "0.1.1"
44
edition = "2021"
55
authors = ["DodoRare Team <support@dodorare.com>"]
66
description = "Cross-Platform Rust Toolkit for Games 🏹"

0 commit comments

Comments
 (0)