Skip to content

Commit

Permalink
Add fluivo-run to Tier2 for MacOS (#1357)
Browse files Browse the repository at this point in the history
This causes `fluvio-run` to be installed by `install.sh` on MacOS
  • Loading branch information
nicholastmosher committed Aug 3, 2021
1 parent fdbfdfc commit e4c4061
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
14 changes: 10 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ env:

jobs:


# build binaries for linux musl which is primary OS for testing clusters
build_primary_binaries:
name: Build ${{ matrix.binary }} for ${{ matrix.rust-target }} on (${{ matrix.os }})
Expand Down Expand Up @@ -106,7 +105,6 @@ jobs:
name: ${{ matrix.binary }}-${{ matrix.rust-target }}
path: ${{ env.RUST_BIN_DIR }}/${{ matrix.binary }}


# build other binaries which doesn't need test
build_binaries:
name: Build ${{ matrix.binary }} for ${{ matrix.rust-target }} on (${{ matrix.os }})
Expand Down Expand Up @@ -145,6 +143,10 @@ jobs:
rust: stable
rust-target: x86_64-apple-darwin
binary: fluvio
- os: macos-latest
rust: stable
rust-target: x86_64-apple-darwin
binary: fluvio-run
- os: macos-11
rust: stable
rust-target: aarch64-apple-darwin
Expand Down Expand Up @@ -191,6 +193,10 @@ jobs:
if: ${{ matrix.binary == 'fluvio.exe' }}
run: make build-cli-minimal

- name: Build fluvio-run
if: ${{ matrix.binary == 'fluvio-run' }}
run: make build-cluster

# Upload artifacts
- name: Upload artifact - ${{ matrix.binary }}
uses: actions/upload-artifact@v2
Expand Down Expand Up @@ -241,7 +247,6 @@ jobs:
if: ${{ matrix.check == 'integration' }}
run: make run-integration-test


check_wasm:
name: Build WASM crates (${{ matrix.wasm-crate }})
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -635,7 +640,6 @@ jobs:
gh release upload -R infinyon/fluvio --clobber dev k8-util/helm/pkg_app/*.*
gh release upload -R infinyon/fluvio --clobber dev k8-util/helm/pkg_sys/*.*
publish_github_binaries:
name: Publish to GitHub Releases dev (${{ matrix.artifact }}-${{ matrix.rust-target }})
if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
Expand All @@ -655,6 +659,8 @@ jobs:
include:
- rust-target: x86_64-unknown-linux-musl
artifact: fluvio-run
- rust-target: x86_64-apple-darwin
artifact: fluvio-run
# - rust-target: x86_64-pc-windows-msvc
# artifact: fluvio.exe
permissions: write-all
Expand Down
6 changes: 5 additions & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,13 @@ assert_supported_cluster_target() {
echo "x86_64-unknown-linux-musl"
return 0
;;
x86_64-apple-darwin)
echo "x86_64-apple-darwin"
return 0
;;
esac

say "🥈 Target '${_target}' is not a Tier 1 platform target"
say "🥈 Target '${_target}' is not a Tier 1 or 2 platform target"
say "⏭ Skipping installation of cluster executable fluvio-run"
return 1
}
Expand Down

0 comments on commit e4c4061

Please sign in to comment.