Skip to content

Commit

Permalink
Fix release build versioning (#813)
Browse files Browse the repository at this point in the history
PR #800 changed the Linux runner image to Ubuntu 20.04, but only adjusted the clang version for the
main test and release builds, causing other jobs that need to compile capnp_tool to fail.
  • Loading branch information
fhanau authored Jun 26, 2023
1 parent 83c9678 commit c20b89c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/npm-types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
version: ${{ steps.echo.outputs.version }}
date: ${{ steps.echo.outputs.date }}
release_version: ${{ steps.echo.outputs.release_version }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: bazelbuild/setup-bazelisk@v2
Expand All @@ -38,7 +38,7 @@ jobs:
echo "version=${{ inputs.prerelease == false && '4' || '0'}}.$(bazel-bin/external/capnp-cpp/src/capnp/capnp_tool eval src/workerd/io/compatibility-date.capnp supportedCompatibilityDate | tr -d '-' | tr -d '"').${{ inputs.patch }}" >> $GITHUB_OUTPUT;
echo "release_version=1.$(bazel-bin/external/capnp-cpp/src/capnp/capnp_tool eval src/workerd/io/compatibility-date.capnp supportedCompatibilityDate | tr -d '-' | tr -d '"').0" >> $GITHUB_OUTPUT;
build-and-publish-types:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: version
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
version: ${{ steps.echo.outputs.version }}
date: ${{ steps.echo.outputs.date }}
release_version: ${{ steps.echo.outputs.release_version }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: bazelbuild/setup-bazelisk@v2
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ jobs:
version:
outputs:
version: ${{ steps.echo.outputs.version }}
runs-on: ubuntu-20.04
# version job uses ubuntu 22.04, this way we don't have to install the updated clang while
# the build job uses 20.04 for libc compatibility.
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: bazelbuild/setup-bazelisk@v2
Expand Down

0 comments on commit c20b89c

Please # to comment.