Add component versions to releases

Author: calebzulawski

.github/workflows/build-toolchain.yml

@@ -168,6 +168,12 @@ jobs:
     with:
       use-built-toolchain: true
 
+  generate-version-info:
+    needs: [build-llvm, build-sysroot]
+    uses: ./.github/workflows/version-info.yml
+    with:
+      use-built-toolchain: true
+
   release:
     needs: test-bazel-rules
     name: Release
@@ -181,14 +187,20 @@ jobs:
           pattern: '{llvm,sysroot,compiler-rt}-*'
           path: artifacts/
           merge-multiple: True
+      - name: Download version info
+        uses: actions/download-artifact@v4
+        with:
+          name: version-info
       - run: |
           git config user.name github-actions
           git config user.email [email protected]
+      - run: |
+          cat .github/workflows/notes/toolchain.md artifacts/version_info.md > notes.md
       - run: |
           VERSION=toolchain-$(date +%Y.%m.%d)
           if [ "${{ inputs.build_number }}" != "0" ]; then VERSION="$VERSION-${{ inputs.build_number }}"; fi
           git tag -a $VERSION -m "Release $VERSION"
           git push --tags
-          gh release create $VERSION artifacts/*
+          gh release create -F notes.md $VERSION artifacts/*
         env:
           GH_TOKEN: ${{ github.token }}

.github/workflows/notes/toolchain.md

@@ -0,0 +1,9 @@
+This is a toolchain release.
+If you are looking for the Bazel or CMake integrations, please look for one of those releases instead.
+
+This release contains the following:
+* LLVM compiler toolchain
+* Linux sysroots
+* Linux compiler-rt (for cross-compiling sanitizers from non-Linux hosts)
+
+This release contains the following components:

.github/workflows/release.yml

@@ -43,8 +43,14 @@ jobs:
     with:
       ref: ${{ needs.tag.outputs.version }}
 
+  generate-version-info:
+    needs: [tag]
+    uses: ./.github/workflows/version-info.yml
+    with:
+      ref: ${{ needs.tag.outputs.version }}
+
   release:
-    needs: [tag, test-bazel, test-cmake]
+    needs: [tag, test-bazel, test-cmake, generate-version-info]
     uses: bazel-contrib/.github/.github/workflows/[email protected]
     with:
       bazel_test_command: true || # we already tested the tag

.github/workflows/release_prep.sh

@@ -39,4 +39,8 @@ FetchContent_MakeAvailable(PortableCcToolchain)
 
 To enable the toolchain, set \`CMAKE_TOOLCHAIN_FILE\` to \`portable_cc_toolchain/toolchain.cmake\`.
 For cross-compiling, set \`CMAKE_TOOLCHAIN_FILE\` to \`portable_cc_toolchain/<target>.cmake\` (e.g. \`aarch64-unknown-linux-gnu.cmake\`)
+
+These integrations use the following components:
 EOF
+
+cat artifacts/version_info.md

.github/workflows/version-info.yml

@@ -0,0 +1,45 @@
+name: Test bazel rules
+
+on:
+  workflow_call:
+    inputs:
+      use-built-toolchain:
+        type: boolean
+      ref:
+        type: string
+
+jobs:
+
+  test-cmake-rules:
+    name: generate version info
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref }}
+      - name: Download built toolchain
+        uses: actions/download-artifact@v4
+        if: ${{ inputs.use-built-toolchain }}
+        with:
+          pattern: '{llvm-x86_64-unknown-linux-gnu,sysroot-x86_64-unknown-linux-gnu,compiler-rt-linux}'
+          merge-multiple: True
+      - name: Configure built toolchain
+        if: ${{ inputs.use-built-toolchain }}
+        shell: bash
+        run: |
+          echo "PORTABLE_CC_TOOLCHAIN_LLVM=`pwd`/llvm-x86_64-unknown-linux-gnu.tar.xz" >> $GITHUB_ENV
+          echo "PORTABLE_CC_TOOLCHAIN_SYSROOT=`pwd`/sysroot-x86_64-unknown-linux-gnu.tar.xz" >> $GITHUB_ENV
+
+      - name: Build
+        working-directory: cmake/version
+        run: cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE=portable_cc_toolchain/toolchain.cmake && cmake --build build
+
+      - name: Generate version info
+        run: cmake/version/build/version | tee version_info.md
+
+      - name: Upload version info
+        uses: actions/upload-artifact@v4
+        with:
+          name: version-info
+          path: version_info.md
+          if-no-files-found: error

cmake/.gitignore

@@ -1 +1,2 @@
 test/build
+version/build

cmake/version/CMakeLists.txt

@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.14)
+
+include(FetchContent)
+
+FetchContent_Declare(
+    PortableCcToolchain
+    URL "${CMAKE_SOURCE_DIR}/../portable_cc_toolchain"
+    SOURCE_DIR "${CMAKE_BINARY_DIR}/portable_cc_toolchain"
+)
+FetchContent_MakeAvailable(PortableCcToolchain)
+
+project(Version)
+
+add_executable(version main.cpp)

cmake/version/main.cpp

@@ -0,0 +1,38 @@
+#include <features.h>
+#include <iostream>
+#include <linux/version.h>
+#include <sstream>
+
+std::string pad(std::string s) {
+  if (s.length() < 10)
+    return s + std::string(10 - s.length(), ' ');
+  return s;
+}
+
+std::string format_version(int major, int minor, int patch = -1) {
+  std::ostringstream os;
+  os << major << "." << minor;
+  if (patch != -1)
+    os << "." << patch;
+  return pad(os.str());
+}
+
+int main() {
+  std::cout << "| Component            | Version   |" << std::endl;
+  std::cout << "| -------------------- | --------- |" << std::endl;
+  std::cout << "| Clang                | "
+            << format_version(__clang_major__, __clang_minor__,
+                              __clang_patchlevel__)
+            << "|" << std::endl;
+  std::cout << "| libstdc++            | "
+            << format_version(_GLIBCXX_RELEASE, __GNUC_MINOR__,
+                              __GNUC_PATCHLEVEL__)
+            << "|" << std::endl;
+  std::cout << "| glibc                | "
+            << format_version(__GLIBC__, __GLIBC_MINOR__) << "|" << std::endl;
+  std::cout << "| Linux kernel headers | "
+            << format_version(LINUX_VERSION_CODE >> 16,
+                              (LINUX_VERSION_CODE >> 8) & 0xFF,
+                              LINUX_VERSION_CODE & 0xFF)
+            << "|" << std::endl;
+}