Release without debs

.github/workflows/release.yml

@@ -55,7 +55,7 @@ jobs:
           set -ex
           set -o pipefail
           python ./scripts/extract-release-notes.py --target-git-version --describe-path-changes "./samples/constitution" | tee rel-notes.md
-      - name: "Upload .deb Package"
+      - name: "Upload Release Notes"
         uses: actions/upload-artifact@v4
         with:
           name: relnotes
@@ -67,17 +67,10 @@ jobs:
     strategy:
       matrix:
         platform:
-          - name: virtual
-            os: ubuntu
-            image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
-            test_filter: "benchmark|unit"
-          - name: snp
-            os: ubuntu
-            image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
           - name: virtual
             os: azure-linux
             image: mcr.microsoft.com/azurelinux/base/core:3.0
-            test_filter: "benchmark|unit|lts"
+            test_filter: "benchmark|unit"
           - name: snp
             os: azure-linux
             image: mcr.microsoft.com/azurelinux/base/core:3.0
@@ -89,7 +82,6 @@ jobs:
 
     steps:
       - name: "Checkout dependencies"
-        if: ${{ matrix.platform.os == 'azure-linux' }}
         shell: bash
         run: |
           gpg --import /etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY
@@ -101,7 +93,6 @@ jobs:
           fetch-depth: 0
 
       - name: "Install dependencies"
-        if: ${{ matrix.platform.os == 'azure-linux' }}
         shell: bash
         run: |
           set -ex
@@ -117,16 +108,6 @@ jobs:
           cmake -GNinja -DCOMPILE_TARGET=${{ matrix.platform.name }} -DCLIENT_PROTOCOLS_TEST=ON -DCMAKE_BUILD_TYPE=Release ..
           ninja -v | tee build.log
 
-      - name: "Install Extended Testing Tools"
-        if: ${{ matrix.platform.os == 'ubuntu' && matrix.platform.name == 'virtual' }}
-        run: |
-          set -ex
-          sudo apt-get -y update
-          sudo apt install ansible -y
-          cd getting_started/setup_vm
-          ansible-playbook ccf-extended-testing.yml
-        shell: bash
-
       - name: "Test ${{ matrix.platform.name }}"
         if: "${{ matrix.platform.name == 'virtual' }}"
         run: |
@@ -143,37 +124,19 @@ jobs:
           ./tests.sh --timeout 360 --output-on-failure -LE "suite|${{ matrix.platform.test_filter }}"
         shell: bash
 
-      - name: "Upload logs for ${{ matrix.platform.os }}-${{ matrix.platform.name }}"
+      - name: "Upload logs for ${{ matrix.platform.name }}"
         if: success() || failure()
         uses: actions/upload-artifact@v4
         with:
-          name: logs-${{ matrix.platform.os }}-${{ matrix.platform.name }}
+          name: logs-${{ matrix.platform.name }}
           path: |
             build/workspace/*/*.config.json
             build/workspace/*/out
             build/workspace/*/err
             build/workspace/*.ledger/*
           if-no-files-found: ignore
 
-      - name: "Make .deb Package"
-        if: "${{ matrix.platform.os == 'ubuntu' }}"
-        id: make_deb
-        run: |
-          set -ex
-          set -o pipefail
-          cd build
-          cmake -L .. 2>/dev/null | grep CMAKE_INSTALL_PREFIX: | cut -d = -f 2 > /tmp/install_prefix
-          cpack -V -G DEB
-          INITIAL_PKG=`ls *.deb`
-          CCF_GITHUB_PKG=${INITIAL_PKG//\~/_}
-          if [[ "$INITIAL_PKG" != "$CCF_GITHUB_PKG" ]]; then
-            mv $INITIAL_PKG $CCF_GITHUB_PKG
-          fi
-          echo "name=$CCF_GITHUB_PKG" >> $GITHUB_OUTPUT
-        shell: bash
-
       - name: "Make .rpm (devel) Package"
-        if: "${{ matrix.platform.os == 'azure-linux' }}"
         id: make_rpm_devel
         run: |
           set -ex
@@ -190,7 +153,6 @@ jobs:
         shell: bash
 
       - name: "Make .rpm (run) Package"
-        if: "${{ matrix.platform.os == 'azure-linux' }}"
         id: make_rpm_run
         run: |
           set -ex
@@ -211,16 +173,7 @@ jobs:
           echo "name=$CCF_GITHUB_PKG" >> $GITHUB_OUTPUT
         shell: bash
 
-      - name: "Install CCF Debian package"
-        if: "${{ matrix.platform.os == 'ubuntu' }}"
-        run: |
-          set -ex
-          cd build
-          sudo apt -y install ./${{ steps.make_deb.outputs.name }}
-        shell: bash
-
-      - name: "Install CCF RPM package"
-        if: "${{ matrix.platform.os == 'azure-linux' }}"
+      - name: "Install CCF package"
         run: |
           set -ex
           cd build
@@ -251,43 +204,34 @@ jobs:
           ./tests/test_install_build.sh -DCOMPILE_TARGET=${{ matrix.platform.name }}
         shell: bash
 
-      - name: "Upload .deb Package"
-        if: "${{ matrix.platform.os == 'ubuntu' }}"
-        uses: actions/upload-artifact@v4
-        with:
-          name: pkg-${{ matrix.platform.os }}-${{ matrix.platform.name }}
-          path: build/${{ steps.make_deb.outputs.name }}
-
       - name: "Upload .rpm Package"
-        if: "${{ matrix.platform.os == 'azure-linux' }}"
         uses: actions/upload-artifact@v4
         with:
-          name: pkg-${{ matrix.platform.os }}-${{ matrix.platform.name }}
+          name: pkg-${{ matrix.platform.name }}
           path: build/${{ steps.make_rpm_run.outputs.name }}
 
       - name: "Upload -devel.rpm Package"
-        if: "${{ matrix.platform.os == 'azure-linux' }}"
         uses: actions/upload-artifact@v4
         with:
-          name: pkg-${{ matrix.platform.os }}-${{ matrix.platform.name }}-devel
+          name: pkg-${{ matrix.platform.name }}-devel
           path: build/${{ steps.make_rpm_devel.outputs.name }}
 
       - name: "Upload Compatibility Report"
-        if: "${{ matrix.platform.os == 'ubuntu' && matrix.platform.name == 'virtual' }}"
+        if: "${{ matrix.platform.name == 'virtual' }}"
         uses: actions/upload-artifact@v4
         with:
           name: compatibility
           path: build/compatibility_report.json
 
       - name: "Upload TLS Report"
-        if: "${{ matrix.platform.os == 'ubuntu' && matrix.platform.name == 'virtual' }}"
+        if: "${{ matrix.platform.name == 'virtual' }}"
         uses: actions/upload-artifact@v4
         with:
           name: tls
           path: build/tls_report.html
 
       - name: "Build Python Wheel"
-        if: "${{ matrix.platform.os == 'ubuntu' && matrix.platform.name == 'virtual' }}"
+        if: "${{ matrix.platform.name == 'virtual' }}"
         id: build_wheel
         run: |
           set -ex
@@ -301,14 +245,14 @@ jobs:
         shell: bash
 
       - name: "Upload Python Wheel"
-        if: "${{ matrix.platform.os == 'ubuntu' && matrix.platform.name == 'virtual' }}"
+        if: "${{ matrix.platform.name == 'virtual' }}"
         uses: actions/upload-artifact@v4
         with:
           name: wheel
           path: python/${{ steps.build_wheel.outputs.name }}
 
       - name: "Build TS Package"
-        if: "${{ matrix.platform.os == 'ubuntu' && matrix.platform.name == 'virtual' }}"
+        if: "${{ matrix.platform.name == 'virtual' }}"
         id: build_tstgz
         run: |
           set -ex
@@ -323,7 +267,7 @@ jobs:
         shell: bash
 
       - name: "Upload TS Package"
-        if: "${{ matrix.platform.os == 'ubuntu' && matrix.platform.name == 'virtual' }}"
+        if: "${{ matrix.platform.name == 'virtual' }}"
         uses: actions/upload-artifact@v4
         with:
           name: tstgz

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [6.0.0-rc3]
+
+[6.0.0-rc3]: https://github.com/microsoft/CCF/releases/tag/ccf-6.0.0-rc3
+
+### Removed
+
+- Debian packages are no longer published from 6.0.0-rc3 onwards. Azure Linux base images and RPM packages are recommended instead (#6939).
+
 ## [6.0.0-rc2]
 
 [6.0.0-rc2]: https://github.com/microsoft/CCF/releases/tag/6.0.0-rc2

python/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ccf"
-version = "6.0.0-rc2"
+version = "6.0.0-rc3"
 authors = [
   { name="CCF Team", email="[email protected]" },
 ]

scripts/extract-release-notes.py

@@ -6,15 +6,6 @@
 import sys
 import subprocess
 
-MICROSOFT_ARTIFACT_REGISTRY_NAME = "mcr.microsoft.com"
-MICROSOFT_ARTIFACT_REGISTRY_PREFIX = "product"
-CCF_APP_IMAGE_PREFIX = "ccf/app"
-CCF_MCR_IMAGES = {
-    "App Development": f"{CCF_APP_IMAGE_PREFIX}/dev",
-    "C++ Runtime": f"{CCF_APP_IMAGE_PREFIX}/run",
-    "TypeScript/JavaScript Runtime": f"{CCF_APP_IMAGE_PREFIX}/run-js",
-}
-
 
 def main():
     parser = argparse.ArgumentParser(
@@ -41,12 +32,6 @@ def main():
         help="Fix any automatically correctable errors",
         action="store_true",
     )
-    parser.add_argument(
-        "--append-mcr-images",
-        help="If true, automatically append MCR images URLs to release notes",
-        action="store_true",
-        default=False,
-    )
     parser.add_argument(
         "--describe-path-changes",
         help="If true, add a note whenever the given path has changes between releases.",
@@ -163,17 +148,6 @@ def main():
                             f"\n- **Note**: This release include changes to `{path}`, which may be viewed [here](https://github.com/Microsoft/CCF/compare/{prev_version}...{git_version}#files_bucket)"
                         )
 
-            if args.append_mcr_images:
-                print("\n**MCR Docker Images:** ", end="")
-                print(
-                    ", ".join(
-                        [
-                            f"[{desc}](https://{MICROSOFT_ARTIFACT_REGISTRY_NAME}/{MICROSOFT_ARTIFACT_REGISTRY_PREFIX}/{name}/tags)"
-                            for desc, name in CCF_MCR_IMAGES.items()
-                        ]
-                    )
-                )
-
         else:
             print("CHANGELOG is valid!")