From 5ad0114aac0fff0d2c8367549322fadac80fdbaf Mon Sep 17 00:00:00 2001 From: Manish Gupta <59428681+mguptahub@users.noreply.github.com> Date: Wed, 3 Jul 2024 13:30:25 +0530 Subject: [PATCH 1/8] fix:feature preview (#4976) * custom base tags * fixed aio actions --- .github/workflows/build-aio-base.yml | 31 ++++++++++++++---------- .github/workflows/build-aio-branch.yml | 8 +++++- .github/workflows/feature-deployment.yml | 12 ++++++++- 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-aio-base.yml b/.github/workflows/build-aio-base.yml index f403cbe620..301fd8766a 100644 --- a/.github/workflows/build-aio-base.yml +++ b/.github/workflows/build-aio-base.yml @@ -2,6 +2,11 @@ name: Build AIO Base Image on: workflow_dispatch: + inputs: + base_tag_name: + description: 'Base Tag Name' + required: false + default: '' env: TARGET_BRANCH: ${{ github.ref_name }} @@ -22,27 +27,29 @@ jobs: - id: set_env_variables name: Set Environment Variables run: | + echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT + + if [ "${{ github.event.inputs.base_tag_name }}" != "" ]; then + echo "IMAGE_TAG=${{ github.event.inputs.base_tag_name }}" >> $GITHUB_OUTPUT + elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then + echo "IMAGE_TAG=latest" >> $GITHUB_OUTPUT + elif [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then + echo "IMAGE_TAG=preview" >> $GITHUB_OUTPUT + else + echo "IMAGE_TAG=develop" >> $GITHUB_OUTPUT + fi + + if [ "${{ env.TARGET_BRANCH }}" == "master" ]; then echo "BUILDX_DRIVER=cloud" >> $GITHUB_OUTPUT echo "BUILDX_VERSION=lab:latest" >> $GITHUB_OUTPUT echo "BUILDX_PLATFORMS=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT echo "BUILDX_ENDPOINT=makeplane/plane-dev" >> $GITHUB_OUTPUT - echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT - - echo "IMAGE_TAG=latest" >> $GITHUB_OUTPUT else echo "BUILDX_DRIVER=docker-container" >> $GITHUB_OUTPUT echo "BUILDX_VERSION=latest" >> $GITHUB_OUTPUT echo "BUILDX_PLATFORMS=linux/amd64" >> $GITHUB_OUTPUT echo "BUILDX_ENDPOINT=" >> $GITHUB_OUTPUT - - if [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then - echo "TARGET_BRANCH=preview" >> $GITHUB_OUTPUT - echo "IMAGE_TAG=preview" >> $GITHUB_OUTPUT - else - echo "TARGET_BRANCH=develop" >> $GITHUB_OUTPUT - echo "IMAGE_TAG=develop" >> $GITHUB_OUTPUT - fi fi - id: checkout_files @@ -54,7 +61,6 @@ jobs: needs: [base_build_setup] env: BASE_IMG_TAG: makeplane/plane-aio-base:full-${{ needs.base_build_setup.outputs.image_tag }} - TARGET_BRANCH: ${{ needs.base_build_setup.outputs.gh_branch_name }} BUILDX_DRIVER: ${{ needs.base_build_setup.outputs.gh_buildx_driver }} BUILDX_VERSION: ${{ needs.base_build_setup.outputs.gh_buildx_version }} BUILDX_PLATFORMS: ${{ needs.base_build_setup.outputs.gh_buildx_platforms }} @@ -96,7 +102,6 @@ jobs: needs: [base_build_setup] env: BASE_IMG_TAG: makeplane/plane-aio-base:slim-${{ needs.base_build_setup.outputs.image_tag }} - TARGET_BRANCH: ${{ needs.base_build_setup.outputs.gh_branch_name }} BUILDX_DRIVER: ${{ needs.base_build_setup.outputs.gh_buildx_driver }} BUILDX_VERSION: ${{ needs.base_build_setup.outputs.gh_buildx_version }} BUILDX_PLATFORMS: ${{ needs.base_build_setup.outputs.gh_buildx_platforms }} diff --git a/.github/workflows/build-aio-branch.yml b/.github/workflows/build-aio-branch.yml index 6359dfe38c..de68d4b96d 100644 --- a/.github/workflows/build-aio-branch.yml +++ b/.github/workflows/build-aio-branch.yml @@ -13,6 +13,10 @@ on: type: boolean required: false default: false + base_tag_name: + description: 'Base Tag Name' + required: false + default: '' release: types: [released, prereleased] @@ -52,7 +56,9 @@ jobs: echo "BUILDX_PLATFORMS=linux/amd64" >> $GITHUB_OUTPUT echo "BUILDX_ENDPOINT=" >> $GITHUB_OUTPUT - if [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then + if [ "${{ github.event.inputs.base_tag_name }}" != "" ]; then + echo "AIO_BASE_TAG=${{ github.event.inputs.base_tag_name }}" >> $GITHUB_OUTPUT + elif [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then echo "AIO_BASE_TAG=preview" >> $GITHUB_OUTPUT else echo "AIO_BASE_TAG=develop" >> $GITHUB_OUTPUT diff --git a/.github/workflows/feature-deployment.yml b/.github/workflows/feature-deployment.yml index 1abe0af196..0c71564e12 100644 --- a/.github/workflows/feature-deployment.yml +++ b/.github/workflows/feature-deployment.yml @@ -2,6 +2,11 @@ name: Feature Preview on: workflow_dispatch: + inputs: + base_tag_name: + description: 'Base Tag Name' + required: false + default: 'preview' env: TARGET_BRANCH: ${{ github.ref_name }} @@ -29,7 +34,12 @@ jobs: echo "BUILDX_VERSION=latest" >> $GITHUB_OUTPUT echo "BUILDX_PLATFORMS=linux/amd64" >> $GITHUB_OUTPUT echo "BUILDX_ENDPOINT=" >> $GITHUB_OUTPUT - echo "AIO_BASE_TAG=develop" >> $GITHUB_OUTPUT + + if [ "${{ github.event.inputs.base_tag_name }}" != "" ]; then + echo "AIO_BASE_TAG=${{ github.event.inputs.base_tag_name }}" >> $GITHUB_OUTPUT + else + echo "AIO_BASE_TAG=develop" >> $GITHUB_OUTPUT + fi echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT From 8f59a36bda9492185f350e755d3ddc6b6429dc76 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Wed, 3 Jul 2024 13:49:28 +0530 Subject: [PATCH 2/8] fix: sidebar quick action overlapping (#5020) --- web/core/components/workspace/sidebar/quick-actions.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/core/components/workspace/sidebar/quick-actions.tsx b/web/core/components/workspace/sidebar/quick-actions.tsx index eebc039172..1d6bc683fe 100644 --- a/web/core/components/workspace/sidebar/quick-actions.tsx +++ b/web/core/components/workspace/sidebar/quick-actions.tsx @@ -109,9 +109,7 @@ export const SidebarQuickActions = observer(() => { )} {isDraftButtonOpen && ( -
+