From a2471ee9812730d6e09178deb15b347fee4a2a3c Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Mon, 22 Jan 2024 10:34:19 +0000 Subject: [PATCH] Fix release workflow --- .github/workflows/frontend-build.yml | 3 +++ .github/workflows/release.yml | 17 ++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/frontend-build.yml b/.github/workflows/frontend-build.yml index ae8651a9..b3d689f7 100644 --- a/.github/workflows/frontend-build.yml +++ b/.github/workflows/frontend-build.yml @@ -7,6 +7,7 @@ on: semver: required: true type: string + default: '' push: branches: [ "main" ] paths: [ "frontend" ] @@ -85,6 +86,8 @@ jobs: # Invoke pre-release image build if this was not a tag push # Docker images tagged only with short commit hash + - name: Print semver + run: echo The semver is ${{ github.event.inputs.semver }} - name: 'Invoke Coodinator Image CI' if: inputs.semver == '' uses: benc-uk/workflow-dispatch@v121 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f0394d71..807591d2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,34 +37,33 @@ jobs: echo "Versions do not match! You might have forgotten to update the version on a component."; exit $ERRCODE; fi - - integration-tests: - uses: RoboSats/robosats/.github/workflows/integration-tests.yml@main - needs: check-versions - frontend-build: uses: RoboSats/robosats/.github/workflows/frontend-build.yml@main needs: check-versions with: semver: ${{ needs.check-versions.outputs.semver }} + integration-tests: + uses: RoboSats/robosats/.github/workflows/integration-tests.yml@main + needs: [frontend-build, check-versions] + coordinator-image: uses: RoboSats/robosats/.github/workflows/coordinator-image.yml@main - needs: [frontend-build] # django-test, + needs: [frontend-build, integration-tests, check-versions] secrets: inherit with: semver: ${{ needs.check-versions.outputs.semver }} selfhosted-client-image: uses: RoboSats/robosats/.github/workflows/selfhosted-client-image.yml@main - needs: frontend-build + needs: [frontend-build, check-versions] secrets: inherit with: semver: ${{ needs.check-versions.outputs.semver }} web-client-image: uses: RoboSats/robosats/.github/workflows/web-client-image.yml@main - needs: frontend-build + needs: [frontend-build, check-versions] secrets: inherit with: semver: ${{ needs.check-versions.outputs.semver }} @@ -76,7 +75,7 @@ jobs: semver: ${{ needs.check-versions.outputs.semver }} release: - needs: [check-versions, coordinator-image, client-image, android-build] + needs: [check-versions, integration-tests, coordinator-image, selfhosted-client-image, web-client-image, android-build] runs-on: ubuntu-latest steps: - name: Checkout