From c057297d798410937cdf8fe636dbd815a3a86852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Somhairle=20MacLe=C3=B2id?= Date: Fri, 24 Jan 2025 12:29:09 +0000 Subject: [PATCH] Fix `@cloudflare/workers-types` version (#3405) * Update release.yml * Update release.yml * Update release.yml --- .github/workflows/release.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bbb9b126675..377a86db688 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,13 +4,24 @@ on: push: branches: - main + workflow_dispatch: + inputs: + patch: + description: 'Patch Version' + required: true + default: '0' + prerelease: + description: 'Is Prerelease' + type: boolean + default: false + jobs: version: outputs: date: ${{ steps.echo.outputs.date }} version: ${{ steps.echo.outputs.version }} - release_version: ${{ steps.echo.outputs.release_version }} + types_version: ${{ steps.echo.outputs.types_version }} # version job uses ubuntu 24.04, this way we don't have to install the updated clang while # the build job uses 22.04 for libc compatibility. runs-on: ubuntu-24.04 @@ -19,8 +30,8 @@ jobs: - id: echo run: | echo "date=$(cat src/workerd/io/supported-compatibility-date.txt)" >> $GITHUB_OUTPUT; - echo "version=1.$(cat src/workerd/io/supported-compatibility-date.txt | tr -d '-').0" >> $GITHUB_OUTPUT; - echo "release_version=1.$(cat src/workerd/io/supported-compatibility-date.txt | tr -d '-').0" >> $GITHUB_OUTPUT; + echo "version=${{ (github.event.action != 'push' && inputs.prerelease == true) && '0' || '1'}}.$(cat src/workerd/io/supported-compatibility-date.txt | tr -d '-').${{ github.event.action == 'push' && '0' || inputs.patch }}" >> $GITHUB_OUTPUT; + echo "types_version=${{ (github.event.action != 'push' && inputs.prerelease == true) && '0' || '4'}}.$(cat src/workerd/io/supported-compatibility-date.txt | tr -d '-').${{ github.event.action == 'push' && '0' || inputs.patch }}" >> $GITHUB_OUTPUT; check-tag: name: Check tag is new outputs: @@ -355,7 +366,7 @@ jobs: - name: Build package run: node npm/scripts/build-types-package.mjs env: - WORKERD_VERSION: ${{ needs.version.outputs.version }} + WORKERD_VERSION: ${{ needs.version.outputs.types_version }} LATEST_COMPATIBILITY_DATE: ${{ needs.version.outputs.date }} - run: cp -r bazel-bin/types/definitions/. npm/workers-types - run: cp npm/workers-types/oldest/* npm/workers-types