Skip to content

Commit 360e875

Browse files
maxtropetsmaxtropets
authored
Release without debs (#6939)
1 parent 904ee0f commit 360e875

File tree

4 files changed

+22
-96
lines changed

4 files changed

+22
-96
lines changed

‎.github/workflows/release.yml‎

Lines changed: 13 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
set -ex
5656
set -o pipefail
5757
python ./scripts/extract-release-notes.py --target-git-version --describe-path-changes "./samples/constitution" | tee rel-notes.md
58-
- name: "Upload .deb Package"
58+
- name: "Upload Release Notes"
5959
uses: actions/upload-artifact@v4
6060
with:
6161
name: relnotes
@@ -67,17 +67,10 @@ jobs:
6767
strategy:
6868
matrix:
6969
platform:
70-
- name: virtual
71-
os: ubuntu
72-
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
73-
test_filter: "benchmark|unit"
74-
- name: snp
75-
os: ubuntu
76-
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
7770
- name: virtual
7871
os: azure-linux
7972
image: mcr.microsoft.com/azurelinux/base/core:3.0
80-
test_filter: "benchmark|unit|lts"
73+
test_filter: "benchmark|unit"
8174
- name: snp
8275
os: azure-linux
8376
image: mcr.microsoft.com/azurelinux/base/core:3.0
@@ -89,7 +82,6 @@ jobs:
8982

9083
steps:
9184
- name: "Checkout dependencies"
92-
if: ${{ matrix.platform.os == 'azure-linux' }}
9385
shell: bash
9486
run: |
9587
gpg --import /etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY
@@ -101,7 +93,6 @@ jobs:
10193
fetch-depth: 0
10294

10395
- name: "Install dependencies"
104-
if: ${{ matrix.platform.os == 'azure-linux' }}
10596
shell: bash
10697
run: |
10798
set -ex
@@ -117,16 +108,6 @@ jobs:
117108
cmake -GNinja -DCOMPILE_TARGET=${{ matrix.platform.name }} -DCLIENT_PROTOCOLS_TEST=ON -DCMAKE_BUILD_TYPE=Release ..
118109
ninja -v | tee build.log
119110
120-
- name: "Install Extended Testing Tools"
121-
if: ${{ matrix.platform.os == 'ubuntu' && matrix.platform.name == 'virtual' }}
122-
run: |
123-
set -ex
124-
sudo apt-get -y update
125-
sudo apt install ansible -y
126-
cd getting_started/setup_vm
127-
ansible-playbook ccf-extended-testing.yml
128-
shell: bash
129-
130111
- name: "Test ${{ matrix.platform.name }}"
131112
if: "${{ matrix.platform.name == 'virtual' }}"
132113
run: |
@@ -143,37 +124,19 @@ jobs:
143124
./tests.sh --timeout 360 --output-on-failure -LE "suite|${{ matrix.platform.test_filter }}"
144125
shell: bash
145126

146-
- name: "Upload logs for ${{ matrix.platform.os }}-${{ matrix.platform.name }}"
127+
- name: "Upload logs for ${{ matrix.platform.name }}"
147128
if: success() || failure()
148129
uses: actions/upload-artifact@v4
149130
with:
150-
name: logs-${{ matrix.platform.os }}-${{ matrix.platform.name }}
131+
name: logs-${{ matrix.platform.name }}
151132
path: |
152133
build/workspace/*/*.config.json
153134
build/workspace/*/out
154135
build/workspace/*/err
155136
build/workspace/*.ledger/*
156137
if-no-files-found: ignore
157138

158-
- name: "Make .deb Package"
159-
if: "${{ matrix.platform.os == 'ubuntu' }}"
160-
id: make_deb
161-
run: |
162-
set -ex
163-
set -o pipefail
164-
cd build
165-
cmake -L .. 2>/dev/null | grep CMAKE_INSTALL_PREFIX: | cut -d = -f 2 > /tmp/install_prefix
166-
cpack -V -G DEB
167-
INITIAL_PKG=`ls *.deb`
168-
CCF_GITHUB_PKG=${INITIAL_PKG//\~/_}
169-
if [[ "$INITIAL_PKG" != "$CCF_GITHUB_PKG" ]]; then
170-
mv $INITIAL_PKG $CCF_GITHUB_PKG
171-
fi
172-
echo "name=$CCF_GITHUB_PKG" >> $GITHUB_OUTPUT
173-
shell: bash
174-
175139
- name: "Make .rpm (devel) Package"
176-
if: "${{ matrix.platform.os == 'azure-linux' }}"
177140
id: make_rpm_devel
178141
run: |
179142
set -ex
@@ -190,7 +153,6 @@ jobs:
190153
shell: bash
191154

192155
- name: "Make .rpm (run) Package"
193-
if: "${{ matrix.platform.os == 'azure-linux' }}"
194156
id: make_rpm_run
195157
run: |
196158
set -ex
@@ -211,16 +173,7 @@ jobs:
211173
echo "name=$CCF_GITHUB_PKG" >> $GITHUB_OUTPUT
212174
shell: bash
213175

214-
- name: "Install CCF Debian package"
215-
if: "${{ matrix.platform.os == 'ubuntu' }}"
216-
run: |
217-
set -ex
218-
cd build
219-
sudo apt -y install ./${{ steps.make_deb.outputs.name }}
220-
shell: bash
221-
222-
- name: "Install CCF RPM package"
223-
if: "${{ matrix.platform.os == 'azure-linux' }}"
176+
- name: "Install CCF package"
224177
run: |
225178
set -ex
226179
cd build
@@ -251,43 +204,34 @@ jobs:
251204
./tests/test_install_build.sh -DCOMPILE_TARGET=${{ matrix.platform.name }}
252205
shell: bash
253206

254-
- name: "Upload .deb Package"
255-
if: "${{ matrix.platform.os == 'ubuntu' }}"
256-
uses: actions/upload-artifact@v4
257-
with:
258-
name: pkg-${{ matrix.platform.os }}-${{ matrix.platform.name }}
259-
path: build/${{ steps.make_deb.outputs.name }}
260-
261207
- name: "Upload .rpm Package"
262-
if: "${{ matrix.platform.os == 'azure-linux' }}"
263208
uses: actions/upload-artifact@v4
264209
with:
265-
name: pkg-${{ matrix.platform.os }}-${{ matrix.platform.name }}
210+
name: pkg-${{ matrix.platform.name }}
266211
path: build/${{ steps.make_rpm_run.outputs.name }}
267212

268213
- name: "Upload -devel.rpm Package"
269-
if: "${{ matrix.platform.os == 'azure-linux' }}"
270214
uses: actions/upload-artifact@v4
271215
with:
272-
name: pkg-${{ matrix.platform.os }}-${{ matrix.platform.name }}-devel
216+
name: pkg-${{ matrix.platform.name }}-devel
273217
path: build/${{ steps.make_rpm_devel.outputs.name }}
274218

275219
- name: "Upload Compatibility Report"
276-
if: "${{ matrix.platform.os == 'ubuntu' && matrix.platform.name == 'virtual' }}"
220+
if: "${{ matrix.platform.name == 'virtual' }}"
277221
uses: actions/upload-artifact@v4
278222
with:
279223
name: compatibility
280224
path: build/compatibility_report.json
281225

282226
- name: "Upload TLS Report"
283-
if: "${{ matrix.platform.os == 'ubuntu' && matrix.platform.name == 'virtual' }}"
227+
if: "${{ matrix.platform.name == 'virtual' }}"
284228
uses: actions/upload-artifact@v4
285229
with:
286230
name: tls
287231
path: build/tls_report.html
288232

289233
- name: "Build Python Wheel"
290-
if: "${{ matrix.platform.os == 'ubuntu' && matrix.platform.name == 'virtual' }}"
234+
if: "${{ matrix.platform.name == 'virtual' }}"
291235
id: build_wheel
292236
run: |
293237
set -ex
@@ -301,14 +245,14 @@ jobs:
301245
shell: bash
302246

303247
- name: "Upload Python Wheel"
304-
if: "${{ matrix.platform.os == 'ubuntu' && matrix.platform.name == 'virtual' }}"
248+
if: "${{ matrix.platform.name == 'virtual' }}"
305249
uses: actions/upload-artifact@v4
306250
with:
307251
name: wheel
308252
path: python/${{ steps.build_wheel.outputs.name }}
309253

310254
- name: "Build TS Package"
311-
if: "${{ matrix.platform.os == 'ubuntu' && matrix.platform.name == 'virtual' }}"
255+
if: "${{ matrix.platform.name == 'virtual' }}"
312256
id: build_tstgz
313257
run: |
314258
set -ex
@@ -323,7 +267,7 @@ jobs:
323267
shell: bash
324268

325269
- name: "Upload TS Package"
326-
if: "${{ matrix.platform.os == 'ubuntu' && matrix.platform.name == 'virtual' }}"
270+
if: "${{ matrix.platform.name == 'virtual' }}"
327271
uses: actions/upload-artifact@v4
328272
with:
329273
name: tstgz

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## [6.0.0-rc3]
9+
10+
[6.0.0-rc3]: https://github.com/microsoft/CCF/releases/tag/ccf-6.0.0-rc3
11+
12+
### Removed
13+
14+
- Debian packages are no longer published from 6.0.0-rc3 onwards. Azure Linux base images and RPM packages are recommended instead (#6939).
15+
816
## [6.0.0-rc2]
917

1018
[6.0.0-rc2]: https://github.com/microsoft/CCF/releases/tag/6.0.0-rc2

‎python/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "ccf"
7-
version = "6.0.0-rc2"
7+
version = "6.0.0-rc3"
88
authors = [
99
{ name="CCF Team", email="[email protected]" },
1010
]

‎scripts/extract-release-notes.py‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@
66
import sys
77
import subprocess
88

9-
MICROSOFT_ARTIFACT_REGISTRY_NAME = "mcr.microsoft.com"
10-
MICROSOFT_ARTIFACT_REGISTRY_PREFIX = "product"
11-
CCF_APP_IMAGE_PREFIX = "ccf/app"
12-
CCF_MCR_IMAGES = {
13-
"App Development": f"{CCF_APP_IMAGE_PREFIX}/dev",
14-
"C++ Runtime": f"{CCF_APP_IMAGE_PREFIX}/run",
15-
"TypeScript/JavaScript Runtime": f"{CCF_APP_IMAGE_PREFIX}/run-js",
16-
}
17-
189

1910
def main():
2011
parser = argparse.ArgumentParser(
@@ -41,12 +32,6 @@ def main():
4132
help="Fix any automatically correctable errors",
4233
action="store_true",
4334
)
44-
parser.add_argument(
45-
"--append-mcr-images",
46-
help="If true, automatically append MCR images URLs to release notes",
47-
action="store_true",
48-
default=False,
49-
)
5035
parser.add_argument(
5136
"--describe-path-changes",
5237
help="If true, add a note whenever the given path has changes between releases.",
@@ -163,17 +148,6 @@ def main():
163148
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)"
164149
)
165150

166-
if args.append_mcr_images:
167-
print("\n**MCR Docker Images:** ", end="")
168-
print(
169-
", ".join(
170-
[
171-
f"[{desc}](https://{MICROSOFT_ARTIFACT_REGISTRY_NAME}/{MICROSOFT_ARTIFACT_REGISTRY_PREFIX}/{name}/tags)"
172-
for desc, name in CCF_MCR_IMAGES.items()
173-
]
174-
)
175-
)
176-
177151
else:
178152
print("CHANGELOG is valid!")
179153

0 commit comments

Comments
 (0)