diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index d448fe901..c9371e7ca 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -110,14 +110,27 @@ jobs: echo "::set-output name=currentTag::$CURRENT_TAG" push_docker_image: - name: Build & Push Flyteconsole Image + name: Push to Github Registry needs: [check_for_tag] - uses: flyteorg/flytetools/.github/workflows/publish.yml@master - with: - version: ${{ needs.check_for_tag.outputs.currentTag }} - dockerfile: Dockerfile - push: true - repository: ${{ github.repository }} - secrets: - FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }} - FLYTE_BOT_USERNAME: ${{ secrets.FLYTE_BOT_USERNAME }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: '0' + - name: Autobump version + env: + TAG: ${{ needs.check_for_tag.outputs.currentTag }} + run: | + VERSION=${TAG:1} make update_npmversion + - name: Push Docker Image to Github Registry + uses: whoan/docker-build-with-cache-action@v5 + with: + username: "${{ secrets.FLYTE_BOT_USERNAME }}" + password: evalsocket + image_name: flyteorg/flyteconsole + image_tag: latest,${{ github.sha }},${{ needs.check_for_tag.outputs.currentTag }} + push_git_tag: true + push_image_and_stages: false + dockerfile: Dockerfile + registry: ghcr.io + build_extra_args: "--compress=true" \ No newline at end of file diff --git a/.github/workflows/upgrade_automtion.yml b/.github/workflows/upgrade_automtion.yml index d52bb075f..af967a4d7 100644 --- a/.github/workflows/upgrade_automtion.yml +++ b/.github/workflows/upgrade_automtion.yml @@ -10,6 +10,7 @@ on: options: - boilerplate - flyteidl + - flyteconsole jobs: trigger-upgrade: name: ${{ github.event.inputs.component }} Upgrade @@ -23,7 +24,7 @@ jobs: upgrade_flyteidl: name: Upgrade Flyteidl runs-on: ubuntu-latest - if: ${{ github.event.inputs.component == "boilerplate" }} + if: ${{ github.event.inputs.component == "flyteidl" }} steps: - uses: actions/checkout@v2 with: @@ -47,7 +48,7 @@ jobs: signoff: true branch: flyte-bot-update-flyteidl delete-branch: true - title: 'Update Flyteidl version' + title: "Update Flyteidl version" body: | Update Flyteidl version - Auto-generated by [flyte-bot] @@ -57,3 +58,4 @@ jobs: owners maintainers draft: false + diff --git a/.releaserc.json b/.releaserc.json index 89c98cecf..f31bd2684 100644 --- a/.releaserc.json +++ b/.releaserc.json @@ -10,12 +10,6 @@ ], ["@semantic-release/npm", { "npmPublish": false }], "@semantic-release/github", - [ - "@semantic-release/git", - { - "assets": ["package.json", "CHANGELOG.md"], - "message": "chore(release): Release ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" - } - ] + [] ] } diff --git a/Makefile b/Makefile index ecf6bb4de..41bccb94c 100644 --- a/Makefile +++ b/Makefile @@ -42,3 +42,10 @@ test_unit_codecov: .PHONY: generate_ssl generate_ssl: ./script/generate_ssl.sh + +PLACEHOLDER_NPM := \"version\": \"0.0.0-develop\" + +.PHONY: update_npmversion +update_npmversion: + grep "$(PLACEHOLDER_NPM)" "packages/zapp/console/package.json" + sed -i "s/$(PLACEHOLDER_NPM)/\"version\": \"${VERSION}\"/g" "packages/zapp/console/package.json" \ No newline at end of file diff --git a/packages/zapp/console/package.json b/packages/zapp/console/package.json index 1419c1208..d87895a86 100644 --- a/packages/zapp/console/package.json +++ b/packages/zapp/console/package.json @@ -1,6 +1,6 @@ { "name": "@flyteconsole/client-app", - "version": "1.1.3", + "version": "0.0.0-develop", "description": "The web UI for the Flyte platform", "repository": { "type": "git",