diff --git a/.github/workflows/release-make.yml b/.github/workflows/release-make.yml index f585a8de38..55e07a936f 100644 --- a/.github/workflows/release-make.yml +++ b/.github/workflows/release-make.yml @@ -20,10 +20,6 @@ on: description: Publish to npm type: boolean default: false - downstreams: - description: List of github projects (owner/repo) which should have their dependency bumped to the newly released version (in JSON string array string syntax) - type: string - required: false gpg-fingerprint: description: Fingerprint of the GPG key to use for signing the git tag and assets, if any. type: string @@ -38,6 +34,10 @@ on: description: The number of expected assets, including signatures, excluding generated zip & tarball. type: number required: false + outputs: + npm-id: + description: "The npm package@version string we published" + value: ${{ jobs.npm.outputs.id }} permissions: {} jobs: checks: @@ -327,34 +327,3 @@ jobs: # wait-interval: 10 # check-name: merge # allowed-conclusions: success - - bump-downstreams: - name: Update npm dependency in downstream projects - needs: npm - runs-on: ubuntu-24.04 - if: inputs.downstreams - strategy: - matrix: - repo: ${{ fromJSON(inputs.downstreams) }} - steps: - - uses: actions/checkout@v4 - with: - repository: ${{ matrix.repo }} - ref: staging - token: ${{ secrets.ELEMENT_BOT_TOKEN }} - - - uses: actions/setup-node@v4 - with: - cache: "yarn" - node-version: "lts/*" - - - name: Bump dependency - env: - DEPENDENCY: ${{ needs.npm.outputs.id }} - run: | - git config --global user.email "releases@riot.im" - git config --global user.name "RiotRobot" - yarn upgrade "$DEPENDENCY" --exact - git add package.json yarn.lock - git commit -am"Upgrade dependency to $DEPENDENCY" - git push origin staging diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3b0b3689ac..ca5e9fa559 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,7 +33,37 @@ jobs: with: final: ${{ inputs.mode == 'final' }} npm: ${{ inputs.npm }} - downstreams: '["element-hq/element-web"]' + + bump-downstreams: + name: Update npm dependency in downstream projects + needs: release + runs-on: ubuntu-24.04 + strategy: + matrix: + repo: + - element-hq/element-web + steps: + - uses: actions/checkout@v4 + with: + repository: ${{ matrix.repo }} + ref: staging + token: ${{ secrets.ELEMENT_BOT_TOKEN }} + + - uses: actions/setup-node@v4 + with: + cache: "yarn" + node-version: "lts/*" + + - name: Bump dependency + env: + DEPENDENCY: ${{ needs.release.outputs.npm-id }} + run: | + git config --global user.email "releases@riot.im" + git config --global user.name "RiotRobot" + yarn upgrade "$DEPENDENCY" --exact + git add package.json yarn.lock + git commit -am"Upgrade dependency to $DEPENDENCY" + git push origin staging docs: name: Publish Documentation