From 1cd21c71e64093b265bb182ec9869f89fc58c60b Mon Sep 17 00:00:00 2001 From: Jeev B Date: Mon, 9 Jan 2023 14:32:02 -0800 Subject: [PATCH 1/2] Fix dependency of release pipeline Signed-off-by: Jeev B --- .github/workflows/checks.yml | 46 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 3abe5d1d3..b274c6b57 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -51,29 +51,6 @@ jobs: - name: Run linter run: make lint - release: - name: Generate Release - if: ${{ (github.event_name != 'pull_request') && (needs.extract_branch.outputs.branch == 'master') }} - needs: [unit_tests_with_coverage, lint_project, build_docker_image, extract_branch] - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Setup Node.js - uses: actions/setup-node@v1 - with: - node-version: 16 - - name: Install dependencies - run: yarn install --frozen-lockfile - - name: Release - env: - GITHUB_TOKEN: ${{ secrets.FLYTE_BOT_PAT }} - GIT_AUTHOR_NAME: "flyte bot" - GIT_AUTHOR_EMAIL: "admin@flyte.org" - GIT_COMMITTER_NAME: "flyte bot" - GIT_COMMITTER_EMAIL: "admin@flyte.org" - run: npx semantic-release - check_for_tag: name: Get Release Tag needs: release @@ -114,3 +91,26 @@ jobs: secrets: FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }} FLYTE_BOT_USERNAME: ${{ secrets.FLYTE_BOT_USERNAME }} + + release: + name: Generate Release + if: ${{ (github.event_name != 'pull_request') && (needs.extract_branch.outputs.branch == 'master') }} + needs: [unit_tests_with_coverage, lint_project, push_docker_image, extract_branch] + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Node.js + uses: actions/setup-node@v1 + with: + node-version: 16 + - name: Install dependencies + run: yarn install --frozen-lockfile + - name: Release + env: + GITHUB_TOKEN: ${{ secrets.FLYTE_BOT_PAT }} + GIT_AUTHOR_NAME: "flyte bot" + GIT_AUTHOR_EMAIL: "admin@flyte.org" + GIT_COMMITTER_NAME: "flyte bot" + GIT_COMMITTER_EMAIL: "admin@flyte.org" + run: npx semantic-release From 9eddf6b83f3121ccc3c5e686c2763e43a39f80a2 Mon Sep 17 00:00:00 2001 From: Jeev B Date: Mon, 9 Jan 2023 14:39:22 -0800 Subject: [PATCH 2/2] Restore build_docker_image pipeline Signed-off-by: Jeev B --- .github/workflows/checks.yml | 58 ++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index b274c6b57..8c84b322e 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -51,6 +51,41 @@ jobs: - name: Run linter run: make lint + build_docker_image: + name: Build Flyteconsole Image + uses: flyteorg/flytetools/.github/workflows/publish.yml@master + with: + version: v1 + dockerfile: Dockerfile + push: false + repository: ${{ github.repository }} + secrets: + FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }} + FLYTE_BOT_USERNAME: ${{ secrets.FLYTE_BOT_USERNAME }} + + release: + name: Generate Release + if: ${{ (github.event_name != 'pull_request') && (needs.extract_branch.outputs.branch == 'master') }} + needs: [unit_tests_with_coverage, lint_project, build_docker_image, extract_branch] + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Node.js + uses: actions/setup-node@v1 + with: + node-version: 16 + - name: Install dependencies + run: yarn install --frozen-lockfile + - name: Release + env: + GITHUB_TOKEN: ${{ secrets.FLYTE_BOT_PAT }} + GIT_AUTHOR_NAME: "flyte bot" + GIT_AUTHOR_EMAIL: "admin@flyte.org" + GIT_COMMITTER_NAME: "flyte bot" + GIT_COMMITTER_EMAIL: "admin@flyte.org" + run: npx semantic-release + check_for_tag: name: Get Release Tag needs: release @@ -91,26 +126,3 @@ jobs: secrets: FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }} FLYTE_BOT_USERNAME: ${{ secrets.FLYTE_BOT_USERNAME }} - - release: - name: Generate Release - if: ${{ (github.event_name != 'pull_request') && (needs.extract_branch.outputs.branch == 'master') }} - needs: [unit_tests_with_coverage, lint_project, push_docker_image, extract_branch] - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Setup Node.js - uses: actions/setup-node@v1 - with: - node-version: 16 - - name: Install dependencies - run: yarn install --frozen-lockfile - - name: Release - env: - GITHUB_TOKEN: ${{ secrets.FLYTE_BOT_PAT }} - GIT_AUTHOR_NAME: "flyte bot" - GIT_AUTHOR_EMAIL: "admin@flyte.org" - GIT_COMMITTER_NAME: "flyte bot" - GIT_COMMITTER_EMAIL: "admin@flyte.org" - run: npx semantic-release