Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:w3champions/flo into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
fluxxu committed Aug 12, 2022
2 parents 93179a8 + 47f3da4 commit 6e8c49d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: Build
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
os: [ubuntu-latest, windows-2019, macos-latest]
runs-on: ${{ matrix.os }}

steps:
Expand Down Expand Up @@ -50,9 +50,9 @@ jobs:
args: --release -p flo-worker

- name: Archive
if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }}
uses: thedoctor0/zip-release@master
with:
if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }}
type: 'zip'
filename: ${{ steps.vars.outputs.release_file_name }}
directory: target/release
Expand Down Expand Up @@ -84,6 +84,6 @@ jobs:
prerelease: true
automatic_release_tag: ${{ steps.branch-name.outputs.tag }}
files: |
flo-windows-latest/*.zip
flo-windows-2019/*.zip
flo-macos-latest/*.zip
flo-ubuntu-latest/*.zip
4 changes: 2 additions & 2 deletions Cargo.lock

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

4 changes: 0 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ jobs:
- script: |
curl https://sh.rustup.rs/ -sSf | sh -s -- --default-toolchain stable -y
displayName: 'install rust'
- script: |
cargo check --all
displayName: 'check'
# - script: |
# cargo build -p flo-controller-service --release
Expand Down
2 changes: 1 addition & 1 deletion binaries/flo-worker/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "flo-worker"
version = "0.12.0"
version = "0.13.0"
authors = ["Flux Xu <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion crates/client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "flo-client"
version = "0.12.0"
version = "0.13.0"
authors = ["Flux Xu <[email protected]>"]
edition = "2018"

Expand Down

0 comments on commit 6e8c49d

Please sign in to comment.