Prepare for release 1.4.8 (#594)

Azure · Mar 11, 2024 · 657b163 · 657b163
1 parent 9743701
commit 657b163
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 32 deletions.
diff --git a/.github/workflows/packages.yaml b/.github/workflows/packages.yaml
@@ -44,9 +44,6 @@ jobs:
           arch: 'aarch64'
         # Include this for mariner package builds. Mariner cannot be built on its own OS so we need an Ubuntu container.
         include:
-        - container_os: 'ubuntu:20.04'
-          arch: 'amd64'
-          os: 'mariner:1'
         - container_os: 'ubuntu:20.04'
           arch: 'amd64'
           os: 'mariner:2'
@@ -73,7 +70,7 @@ jobs:
         ARCH: "${{ matrix.arch }}"
         OS: "${{ matrix.os }}"
         # PACKAGE_VERSION should end with '~dev' on the main branch.
-        PACKAGE_VERSION: '1.4.7'
+        PACKAGE_VERSION: '1.4.8'
         # PACKAGE_RELEASE should always be '1'.
         PACKAGE_RELEASE: '1'
     - name: 'Generate artifact properties'

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aziotctl/Cargo.toml b/aziotctl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aziotctl"
-version = "1.4.7"
+version = "1.4.8"
 authors = ["Azure IoT Edge Devs"]
 edition = "2021"
 homepage = "https://azure.github.io/iot-identity-service/"

diff --git a/aziotd/Cargo.toml b/aziotd/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aziotd"
-version = "1.4.7"
+version = "1.4.8"
 authors = ["Azure IoT Edge Devs"]
 edition = "2021"
 homepage = "https://azure.github.io/iot-identity-service/"

diff --git a/ci/install-build-deps.sh b/ci/install-build-deps.sh
@@ -197,7 +197,7 @@ case "$OS:$ARCH" in
             llvm-dev pkg-config
         ;;
 
-    'mariner:1:amd64' | 'mariner:2:amd64' | 'mariner:1:aarch64' | 'mariner:2:aarch64')
+    'mariner:2:amd64' | 'mariner:2:aarch64')
         export DEBIAN_FRONTEND=noninteractive
         export TZ=UTC
 
@@ -220,15 +220,7 @@ case "$OS:$ARCH" in
             mv /.dockerenv /.dockerenv.old
         fi
 
-        case "$OS" in
-            'mariner:1')
-                BranchTag='1.0-stable'
-                ;;
-            'mariner:2')
-                BranchTag='2.0-stable'
-                ;;
-        esac
-
+        BranchTag='2.0-stable'
         MarinerToolkitDir='/tmp/CBL-Mariner'
         if ! [ -f "$MarinerToolkitDir/toolkit.tar.gz" ]; then
             rm -rf "$MarinerToolkitDir"

diff --git a/ci/package.sh b/ci/package.sh
@@ -110,7 +110,7 @@ case "$OS" in
             "packages/$TARGET_DIR/"
         ;;
 
-    'mariner:1' | 'mariner:2')
+    'mariner:2')
         case "$ARCH" in
             'arm32v7')
                 echo "Cross-compilation on $OS is not supported" >&2
@@ -137,18 +137,9 @@ case "$OS" in
         tar xzvf toolkit.tar.gz
         popd
 
-        case "$OS" in
-            'mariner:1')
-                UsePreview=n
-                TARGET_DIR="mariner1/$ARCH"
-                PackageExtension="cm1"
-                ;;
-            'mariner:2')
-                UsePreview=n
-                TARGET_DIR="mariner2/$ARCH"
-                PackageExtension="cm2"
-                ;;
-        esac
+        UsePreview=n
+        TARGET_DIR="mariner2/$ARCH"
+        PackageExtension="cm2"
 
         # move tarballed iot-identity-service source to building directory
         mkdir -p "$MarinerSourceDir"

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: azure-iot-identity
 base: core22 # the base snap is the execution environment for this snap
-version: '1.4.0~dev' # should end with '~dev' on the main branch
+version: '1.4.8'
 summary: Provides provisioning and cryptographic services for Azure IoT Hub devices.
 description: |
   The Identity Service provisions a device's identity and any modules it runs. The device identity can be based