From ae40d590f8ce647cc69d0d58a827ec8eded4fad7 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 29 May 2023 11:21:50 +0100 Subject: [PATCH] Revert "Publish to docker before pushing to npm" --- .github/workflows/release-develop.yml | 16 ++++++++-------- .github/workflows/release-master.yml | 26 +++++++++++++------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 332348832a..ebd2f4c3ef 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -54,14 +54,6 @@ jobs: - run: yarn build --configuration=production - run: yarn build:sdk - - name: Build/release Docker images - run: | - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD - yarn build:docker:develop - env: - DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }} - - name: Reset pro dependencies run: node scripts/resetProDependencies.js @@ -77,6 +69,14 @@ jobs: echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release:develop + - name: Build/release Docker images + run: | + docker login -u $DOCKER_USER -p $DOCKER_PASSWORD + yarn build:docker:develop + env: + DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} + DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }} + release-helm-chart: needs: [release-images] runs-on: ubuntu-latest diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index a85dbd9c62..304b0de100 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -60,19 +60,6 @@ jobs: - run: yarn build --configuration=production - run: yarn build:sdk - - name: "Get Previous tag" - id: previoustag - uses: "WyriHaximus/github-action-get-previous-tag@v1" - - - name: Build/release Docker images - run: | - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD - yarn build:docker - env: - DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }} - BUDIBASE_RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }} - - name: Reset pro dependencies run: node scripts/resetProDependencies.js @@ -89,6 +76,19 @@ jobs: echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc yarn release + - name: "Get Previous tag" + id: previoustag + uses: "WyriHaximus/github-action-get-previous-tag@v1" + + - name: Build/release Docker images + run: | + docker login -u $DOCKER_USER -p $DOCKER_PASSWORD + yarn build:docker + env: + DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} + DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }} + BUDIBASE_RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }} + release-helm-chart: needs: [release-images] runs-on: ubuntu-latest