Skip to content

Commit 02175ed

Browse files
committed
Merge branch '1.0-dev' into 1.0
2 parents ead38c6 + 605639d commit 02175ed

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

SPECS/mariner-release/mariner-release.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: CBL-Mariner release files
22
Name: mariner-release
33
Version: 1.0
4-
Release: 65%{?dist}
4+
Release: 66%{?dist}
55
License: MIT
66
Group: System Environment/Base
77
URL: https://aka.ms/cbl-mariner
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
6767
%config(noreplace) /etc/issue.net
6868

6969
%changelog
70+
* Fri Aug 04 2023 CBL-Mariner Servicing Account <[email protected]> - 1.0-66
71+
- Bump release for August 2023 Update
72+
7073
* Thu Jun 29 2023 CBL-Mariner Servicing Account <[email protected]> - 1.0-65
7174
- Bump release for June 2023 Update 3
7275

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ findutils-lang-4.6.0-8.cm1.aarch64.rpm
5858
gettext-0.19.8.1-5.cm1.aarch64.rpm
5959
gzip-1.12-1.cm1.aarch64.rpm
6060
make-4.2.1-5.cm1.aarch64.rpm
61-
mariner-release-1.0-65.cm1.noarch.rpm
61+
mariner-release-1.0-66.cm1.noarch.rpm
6262
patch-2.7.6-7.cm1.aarch64.rpm
6363
util-linux-2.32.1-7.cm1.aarch64.rpm
6464
util-linux-devel-2.32.1-7.cm1.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ findutils-lang-4.6.0-8.cm1.x86_64.rpm
5858
gettext-0.19.8.1-5.cm1.x86_64.rpm
5959
gzip-1.12-1.cm1.x86_64.rpm
6060
make-4.2.1-5.cm1.x86_64.rpm
61-
mariner-release-1.0-65.cm1.noarch.rpm
61+
mariner-release-1.0-66.cm1.noarch.rpm
6262
patch-2.7.6-7.cm1.x86_64.rpm
6363
util-linux-2.32.1-7.cm1.x86_64.rpm
6464
util-linux-devel-2.32.1-7.cm1.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ m4-debuginfo-1.4.18-4.cm1.aarch64.rpm
259259
make-4.2.1-5.cm1.aarch64.rpm
260260
make-debuginfo-4.2.1-5.cm1.aarch64.rpm
261261
mariner-check-macros-1.0-8.cm1.noarch.rpm
262-
mariner-release-1.0-65.cm1.noarch.rpm
262+
mariner-release-1.0-66.cm1.noarch.rpm
263263
mariner-repos-1.0-16.cm1.noarch.rpm
264264
mariner-repos-extras-1.0-16.cm1.noarch.rpm
265265
mariner-repos-extras-preview-1.0-16.cm1.noarch.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ m4-debuginfo-1.4.18-4.cm1.x86_64.rpm
259259
make-4.2.1-5.cm1.x86_64.rpm
260260
make-debuginfo-4.2.1-5.cm1.x86_64.rpm
261261
mariner-check-macros-1.0-8.cm1.noarch.rpm
262-
mariner-release-1.0-65.cm1.noarch.rpm
262+
mariner-release-1.0-66.cm1.noarch.rpm
263263
mariner-repos-1.0-16.cm1.noarch.rpm
264264
mariner-repos-extras-1.0-16.cm1.noarch.rpm
265265
mariner-repos-extras-preview-1.0-16.cm1.noarch.rpm

0 commit comments

Comments
 (0)