Browse Source

Merge pull request #7251 from Budibase/fix/various-fixes-martin

roll out release services after deployment
master
Martin McKeaveney 4 years ago
committed by GitHub
parent
commit
e4f0b02bf0
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      .github/workflows/deploy-release.yml
  2. 7
      .github/workflows/release-develop.yml
  3. 1
      packages/builder/src/components/backend/DataTable/DataTable.svelte
  4. 3
      packages/builder/src/components/backend/DataTable/buttons/ImportButton.svelte

7
.github/workflows/deploy-release.yml

@ -68,6 +68,13 @@ jobs:
] ]
env: env:
KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}' KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
- name: Re roll the services
uses: actions-hub/kubectl@master
env:
KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG }}
with:
args: rollout restart deployment proxy-service -n budibase && kubectl rollout restart deployment app-service -n budibase && kubectl rollout restart deployment worker-service -n budibase
- name: Discord Webhook Action - name: Discord Webhook Action
uses: tsickert/discord-webhook@v4.0.0 uses: tsickert/discord-webhook@v4.0.0

7
.github/workflows/release-develop.yml

@ -121,6 +121,13 @@ jobs:
env: env:
KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}' KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
- name: Re roll the services
uses: actions-hub/kubectl@master
env:
KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG }}
with:
args: rollout restart deployment proxy-service -n budibase && kubectl rollout restart deployment app-service -n budibase && kubectl rollout restart deployment worker-service -n budibase
- name: Discord Webhook Action - name: Discord Webhook Action
uses: tsickert/discord-webhook@v4.0.0 uses: tsickert/discord-webhook@v4.0.0
with: with:

1
packages/builder/src/components/backend/DataTable/DataTable.svelte

@ -167,6 +167,7 @@
{/if} {/if}
<HideAutocolumnButton bind:hideAutocolumns /> <HideAutocolumnButton bind:hideAutocolumns />
<ImportButton <ImportButton
disabled={$tables.selected?._id === "ta_users"}
tableId={$tables.selected?._id} tableId={$tables.selected?._id}
on:updaterows={onUpdateRows} on:updaterows={onUpdateRows}
/> />

3
packages/builder/src/components/backend/DataTable/buttons/ImportButton.svelte

@ -3,11 +3,12 @@
import ImportModal from "../modals/ImportModal.svelte" import ImportModal from "../modals/ImportModal.svelte"
export let tableId export let tableId
export let disabled
let modal let modal
</script> </script>
<ActionButton icon="DataUpload" size="S" quiet on:click={modal.show}> <ActionButton icon="DataUpload" size="S" quiet on:click={modal.show} {disabled}>
Import Import
</ActionButton> </ActionButton>
<Modal bind:this={modal}> <Modal bind:this={modal}>

Loading…
Cancel
Save