Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: enable merge group #283

Merged
merged 3 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
name: CI

on:
push:
branches:
- staging
- trying
merge_group:
pull_request:
branches: [master]

Expand Down Expand Up @@ -142,7 +139,6 @@ jobs:

done:
name: Done
if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
needs:
- unit_test
- check_fmt
Expand All @@ -151,5 +147,23 @@ jobs:
- unit_test_k8_client_feature_flags
runs-on: ubuntu-latest
steps:
- name: Dump needs context
env:
CONTEXT: ${{ toJson(needs) }}
run: |
echo -e "\033[33;1;4mDump context\033[0m"
echo -e "$CONTEXT\n"
- name: Report failure on cancellation
if: ${{ contains(needs.*.result, 'cancelled') || cancelled() }}
run: exit 1
- name: Failing test and build
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1
- name: Don't allow skipped
if: ${{ contains(needs.*.result, 'skipped') && github.event_name == 'merge_group' }}
run: exit 1
- name: Successful test and build
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Done
run: echo "Done!"
6 changes: 0 additions & 6 deletions bors.toml

This file was deleted.

1 change: 1 addition & 0 deletions src/k8-client/src/client/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ mod executor {

use fluvio_future::task::spawn;

#[allow(dead_code)]
pub(crate) struct FluvioHyperExecutor;

impl<F: Future + Send + 'static> Executor<F> for FluvioHyperExecutor {
Expand Down
3 changes: 2 additions & 1 deletion src/k8-types/src/app/stateful.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ impl Spec for StatefulSetSpec {

// statefulset doesnt' like to change volume claim template
fn make_same(&mut self, other: &Self) {
self.volume_claim_templates = other.volume_claim_templates.clone();
self.volume_claim_templates
.clone_from(&other.volume_claim_templates)
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/k8-types/src/core/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ impl Spec for ServiceSpec {

fn make_same(&mut self, other: &Self) {
if other.cluster_ip.is_empty() {
self.cluster_ip = "".to_owned();
"".clone_into(&mut self.cluster_ip);
}
}
}
Expand Down
Loading