build: add install and dist targets; ci: use make dist, draft releases, rename to glibc/glibc217, add version check and prepare-release workflow

Michal Stanek · stanek-michal · commit 058606a5e746 · 2025-09-12T17:50:35.000+02:00
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -0,0 +1,51 @@
+name: Prepare Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Release version (e.g., 0.6)"
+        required: true
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  bump-version:
+    name: Bump QUARK_VERSION and open PR
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: false
+
+      - name: Create bump branch
+        id: prep
+        shell: bash
+        run: |
+          set -euo pipefail
+          VERSION="${{ inputs.version }}"
+          BRANCH="release/bump-v${VERSION}"
+          echo "branch=$BRANCH" >> "$GITHUB_OUTPUT"
+          git checkout -b "$BRANCH"
+          # Update QUARK_VERSION to exact VERSION (no trailing 'a')
+          perl -0777 -pe "s/(#define\s+QUARK_VERSION\s+")([^"]+)(")/\1${VERSION}\3/" -i quark.h
+          echo "Updated quark.h to QUARK_VERSION=${VERSION}"
+          git add quark.h
+          git commit -m "release: bump QUARK_VERSION to ${VERSION}"
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v6
+        with:
+          branch: ${{ steps.prep.outputs.branch }}
+          title: "release: bump QUARK_VERSION to ${{ inputs.version }}"
+          body: |
+            This PR bumps QUARK_VERSION to `${{ inputs.version }}` in quark.h.
+
+            After merging, push the release tag `v${{ inputs.version }}` to trigger the release workflow.
+          commit-message: "release: bump QUARK_VERSION to ${{ inputs.version }}"
+          base: ${{ github.ref_name }}
+          labels: release
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,8 +17,8 @@ env:
   TAG: ${{ github.ref_name }}
 
 jobs:
-  build-gnu-amd64:
-    name: Build linux-amd64-gnu
+  build-glibc-amd64:
+    name: Build linux-amd64-glibc
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -30,47 +30,14 @@ jobs:
         run: |
           make docker
 
-      - name: Strip binaries and libs
-        shell: bash
-        run: |
-          set -euo pipefail
-          # Executables
-          for f in quark-mon quark-btf quark-test quark-kube-talker; do
-            if [[ -f "$f" ]]; then strip --strip-unneeded "$f" || true; fi
-          done
-          # Static executables (may not exist on all targets)
-          for f in quark-mon-static quark-btf-static quark-test-static; do
-            if [[ -f "$f" ]]; then strip --strip-unneeded "$f" || true; fi
-          done
-          # Static libraries
-          for f in libquark.a libquark_big.a; do
-            if [[ -f "$f" ]]; then strip -g "$f" || true; fi
-          done
-
       - name: Package artifacts
         shell: bash
         run: |
           set -euo pipefail
-          PKG="quark-${TAG}-linux-amd64-gnu"
-          ROOT="dist/${PKG}"
-          mkdir -p "$ROOT/bin" "$ROOT/bin-static" "$ROOT/lib" "$ROOT/include" "$ROOT/man"
-          # Binaries
-          install -m 0755 quark-mon quark-btf quark-test quark-kube-talker "$ROOT/bin/"
-          # Static binaries (if present)
-          for f in quark-mon-static quark-btf-static quark-test-static; do
-            [[ -f "$f" ]] && install -m 0755 "$f" "$ROOT/bin-static/" || true
-          done
-          # Libraries
-          install -m 0644 libquark.a libquark_big.a "$ROOT/lib/"
-          # Minimal SDK headers
-          install -m 0644 quark.h "$ROOT/include/"
-          # Man pages and docs
-          for f in *.3 *.7 *.8; do
-            [[ -f "$f" ]] && install -m 0644 "$f" "$ROOT/man/" || true
-          done
-          # Notices
-          install -m 0644 LICENSE.txt NOTICE.txt CHANGES "$ROOT/"
-          # Tarball + checksum
+          PKG="quark-${TAG}-linux-amd64-glibc"
+          ROOT="stage/${PKG}"
+          mkdir -p "${ROOT}"
+          make dist DESTDIR="${ROOT}"
           mkdir -p dist
           tar -C "$ROOT" -czf "dist/${PKG}.tar.gz" .
           sha256sum "dist/${PKG}.tar.gz" > "dist/${PKG}.tar.gz.sha256"
@@ -79,13 +46,13 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: quark-${{ env.TAG }}-linux-amd64-gnu
+          name: quark-${{ env.TAG }}-linux-amd64-glibc
           path: |
-            dist/quark-${{ env.TAG }}-linux-amd64-gnu.tar.gz
-            dist/quark-${{ env.TAG }}-linux-amd64-gnu.tar.gz.sha256
+            dist/quark-${{ env.TAG }}-linux-amd64-glibc.tar.gz
+            dist/quark-${{ env.TAG }}-linux-amd64-glibc.tar.gz.sha256
 
-  build-gnu-amd64-glibc217:
-    name: Build linux-amd64-gnu-glibc217 (CentOS 7)
+  build-glibc217-amd64:
+    name: Build linux-amd64-glibc217 (CentOS 7)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -97,47 +64,14 @@ jobs:
         run: |
           make centos7
 
-      - name: Strip binaries and libs
-        shell: bash
-        run: |
-          set -euo pipefail
-          # Executables
-          for f in quark-mon quark-btf quark-test quark-kube-talker; do
-            if [[ -f "$f" ]]; then strip --strip-unneeded "$f" || true; fi
-          done
-          # Static executables (unlikely on this target, but try)
-          for f in quark-mon-static quark-btf-static quark-test-static; do
-            if [[ -f "$f" ]]; then strip --strip-unneeded "$f" || true; fi
-          done
-          # Static libraries
-          for f in libquark.a libquark_big.a; do
-            if [[ -f "$f" ]]; then strip -g "$f" || true; fi
-          done
-
       - name: Package artifacts
         shell: bash
         run: |
           set -euo pipefail
-          PKG="quark-${TAG}-linux-amd64-gnu-glibc217"
-          ROOT="dist/${PKG}"
-          mkdir -p "$ROOT/bin" "$ROOT/bin-static" "$ROOT/lib" "$ROOT/include" "$ROOT/man"
-          # Binaries
-          install -m 0755 quark-mon quark-btf quark-test quark-kube-talker "$ROOT/bin/"
-          # Static binaries (if present)
-          for f in quark-mon-static quark-btf-static quark-test-static; do
-            [[ -f "$f" ]] && install -m 0755 "$f" "$ROOT/bin-static/" || true
-          done
-          # Libraries
-          install -m 0644 libquark.a libquark_big.a "$ROOT/lib/"
-          # Minimal SDK headers
-          install -m 0644 quark.h "$ROOT/include/"
-          # Man pages and docs
-          for f in *.3 *.7 *.8; do
-            [[ -f "$f" ]] && install -m 0644 "$f" "$ROOT/man/" || true
-          done
-          # Notices
-          install -m 0644 LICENSE.txt NOTICE.txt CHANGES "$ROOT/"
-          # Tarball + checksum
+          PKG="quark-${TAG}-linux-amd64-glibc217"
+          ROOT="stage/${PKG}"
+          mkdir -p "${ROOT}"
+          make dist DESTDIR="${ROOT}"
           mkdir -p dist
           tar -C "$ROOT" -czf "dist/${PKG}.tar.gz" .
           sha256sum "dist/${PKG}.tar.gz" > "dist/${PKG}.tar.gz.sha256"
@@ -146,13 +80,13 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: quark-${{ env.TAG }}-linux-amd64-gnu-glibc217
+          name: quark-${{ env.TAG }}-linux-amd64-glibc217
           path: |
-            dist/quark-${{ env.TAG }}-linux-amd64-gnu-glibc217.tar.gz
-            dist/quark-${{ env.TAG }}-linux-amd64-gnu-glibc217.tar.gz.sha256
+            dist/quark-${{ env.TAG }}-linux-amd64-glibc217.tar.gz
+            dist/quark-${{ env.TAG }}-linux-amd64-glibc217.tar.gz.sha256
 
-  build-gnu-arm64:
-    name: Build linux-arm64-gnu
+  build-glibc-arm64:
+    name: Build linux-arm64-glibc
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -164,52 +98,14 @@ jobs:
         run: |
           make docker-cross-arm64
 
-      - name: Strip binaries and libs (in Docker for aarch64)
-        shell: bash
-        run: |
-          set -euo pipefail
-          # Use builder image to run the appropriate aarch64 strip
-          docker run -q \
-            -v "$PWD":"$PWD" \
-            -w "$PWD" \
-            -u "$(id -u):$(id -g)" \
-            quark-builder \
-            bash -lc '
-              set -e
-              for f in quark-mon quark-btf quark-test quark-kube-talker; do
-                [[ -f "$f" ]] && aarch64-linux-gnu-strip --strip-unneeded "$f" || true;
-              done
-              for f in quark-mon-static quark-btf-static quark-test-static; do
-                [[ -f "$f" ]] && aarch64-linux-gnu-strip --strip-unneeded "$f" || true;
-              done
-              for f in libquark.a libquark_big.a; do
-                [[ -f "$f" ]] && aarch64-linux-gnu-strip -g "$f" || true;
-              done'
-
       - name: Package artifacts
         shell: bash
         run: |
           set -euo pipefail
-          PKG="quark-${TAG}-linux-arm64-gnu"
-          ROOT="dist/${PKG}"
-          mkdir -p "$ROOT/bin" "$ROOT/bin-static" "$ROOT/lib" "$ROOT/include" "$ROOT/man"
-          # Binaries
-          install -m 0755 quark-mon quark-btf quark-test quark-kube-talker "$ROOT/bin/"
-          # Static binaries (if present)
-          for f in quark-mon-static quark-btf-static quark-test-static; do
-            [[ -f "$f" ]] && install -m 0755 "$f" "$ROOT/bin-static/" || true
-          done
-          # Libraries
-          install -m 0644 libquark.a libquark_big.a "$ROOT/lib/"
-          # Minimal SDK headers
-          install -m 0644 quark.h "$ROOT/include/"
-          # Man pages and docs
-          for f in *.3 *.7 *.8; do
-            [[ -f "$f" ]] && install -m 0644 "$f" "$ROOT/man/" || true
-          done
-          # Notices
-          install -m 0644 LICENSE.txt NOTICE.txt CHANGES "$ROOT/"
-          # Tarball + checksum
+          PKG="quark-${TAG}-linux-arm64-glibc"
+          ROOT="stage/${PKG}"
+          mkdir -p "${ROOT}"
+          make dist DESTDIR="${ROOT}"
           mkdir -p dist
           tar -C "$ROOT" -czf "dist/${PKG}.tar.gz" .
           sha256sum "dist/${PKG}.tar.gz" > "dist/${PKG}.tar.gz.sha256"
@@ -218,10 +114,10 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: quark-${{ env.TAG }}-linux-arm64-gnu
+          name: quark-${{ env.TAG }}-linux-arm64-glibc
           path: |
-            dist/quark-${{ env.TAG }}-linux-arm64-gnu.tar.gz
-            dist/quark-${{ env.TAG }}-linux-arm64-gnu.tar.gz.sha256
+            dist/quark-${{ env.TAG }}-linux-arm64-glibc.tar.gz
+            dist/quark-${{ env.TAG }}-linux-arm64-glibc.tar.gz.sha256
 
   build-musl-amd64:
     name: Build linux-amd64-musl
@@ -236,47 +132,14 @@ jobs:
         run: |
           make alpine
 
-      - name: Strip binaries and libs
-        shell: bash
-        run: |
-          set -euo pipefail
-          # Executables
-          for f in quark-mon quark-btf quark-test quark-kube-talker; do
-            if [[ -f "$f" ]]; then strip --strip-unneeded "$f" || true; fi
-          done
-          # Static executables (musl static expected here)
-          for f in quark-mon-static quark-btf-static quark-test-static; do
-            if [[ -f "$f" ]]; then strip --strip-unneeded "$f" || true; fi
-          done
-          # Static libraries
-          for f in libquark.a libquark_big.a; do
-            if [[ -f "$f" ]]; then strip -g "$f" || true; fi
-          done
-
       - name: Package artifacts
         shell: bash
         run: |
           set -euo pipefail
           PKG="quark-${TAG}-linux-amd64-musl"
-          ROOT="dist/${PKG}"
-          mkdir -p "$ROOT/bin" "$ROOT/bin-static" "$ROOT/lib" "$ROOT/include" "$ROOT/man"
-          # Binaries
-          install -m 0755 quark-mon quark-btf quark-test quark-kube-talker "$ROOT/bin/"
-          # Static binaries (if present)
-          for f in quark-mon-static quark-btf-static quark-test-static; do
-            [[ -f "$f" ]] && install -m 0755 "$f" "$ROOT/bin-static/" || true
-          done
-          # Libraries
-          install -m 0644 libquark.a libquark_big.a "$ROOT/lib/"
-          # Minimal SDK headers
-          install -m 0644 quark.h "$ROOT/include/"
-          # Man pages and docs
-          for f in *.3 *.7 *.8; do
-            [[ -f "$f" ]] && install -m 0644 "$f" "$ROOT/man/" || true
-          done
-          # Notices
-          install -m 0644 LICENSE.txt NOTICE.txt CHANGES "$ROOT/"
-          # Tarball + checksum
+          ROOT="stage/${PKG}"
+          mkdir -p "${ROOT}"
+          make dist DESTDIR="${ROOT}"
           mkdir -p dist
           tar -C "$ROOT" -czf "dist/${PKG}.tar.gz" .
           sha256sum "dist/${PKG}.tar.gz" > "dist/${PKG}.tar.gz.sha256"
@@ -294,14 +157,40 @@ jobs:
     name: Publish GitHub Release
     runs-on: ubuntu-latest
     needs:
-      - build-gnu-amd64
-      - build-gnu-amd64-glibc217
-      - build-gnu-arm64
+      - build-glibc-amd64
+      - build-glibc217-amd64
+      - build-glibc-arm64
       - build-musl-amd64
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Verify QUARK_VERSION vs tag
+        shell: bash
+        run: |
+          set -euo pipefail
+          TAG="${TAG}"
+          VER_TAG="${TAG#v}"
+          BASE_VER=$(echo "$VER_TAG" | sed -E 's/-rc[0-9]+$//')
+          HDR_VER=$(grep -E '^[[:space:]]*#define[[:space:]]+QUARK_VERSION' quark.h | sed -E 's/.*"([^"]+)".*/\1/')
+          if [[ "$VER_TAG" == *-rc* ]]; then
+            # For -rc tags, expect header to be BASE_VER with trailing 'a'
+            if [[ "$HDR_VER" != "${BASE_VER}a" ]]; then
+              echo "QUARK_VERSION ($HDR_VER) must be ${BASE_VER}a for RC tags ($TAG)" >&2
+              exit 1
+            fi
+          else
+            # For final releases, expect exact match and no trailing 'a'
+            if [[ "$HDR_VER" != "$BASE_VER" ]]; then
+              echo "QUARK_VERSION ($HDR_VER) must equal $BASE_VER for tag $TAG" >&2
+              exit 1
+            fi
+            if [[ "$HDR_VER" == *a ]]; then
+              echo "QUARK_VERSION ($HDR_VER) must not end with 'a' for final release" >&2
+              exit 1
+            fi
+          fi
+
       - name: Download all build artifacts
         uses: actions/download-artifact@v4
         with:
@@ -320,8 +209,9 @@ jobs:
         with:
           tag_name: ${{ env.TAG }}
           body_path: CHANGES
+          draft: true
+          prerelease: ${{ contains(env.TAG, '-rc') }}
           files: |
             dist/*.tar.gz
             dist/*.tar.gz.sha256
             dist/SHA256SUMS
-
diff --git a/Makefile b/Makefile
