Release 5.2.2-rc.8

iongion · Sep 20, 2024 · d5bd856 · d5bd856
1 parent 2898a0c
commit d5bd856
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## 5.2.2-rc.8 - 2024-09-20
+## 5.2.3 - 2024-09-20
 
 ## Changed
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.2.2-rc.7
+5.2.3
diff --git a/docs/VERSION b/docs/VERSION
@@ -1 +1 @@
-5.2.2-rc.7
+5.2.3
diff --git a/docs/index.html b/docs/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" data-version="5.2.2-rc.7">
+<html lang="en" data-version="5.2.3">
 
 <head>
   <meta charset="UTF-8" />
@@ -13,9 +13,9 @@
   <link rel="preconnect" href="//fonts.googleapis.com" />
   <link rel="preconnect" href="//fonts.gstatic.com" crossorigin />
   <link rel="stylesheet" href="//fonts.googleapis.com/css2?family=Montserrat:wght@100;300;500;700&display=swap" />
-  <link rel="stylesheet" href="./css/common.css?v=5.2.2-rc.7" />
-  <link rel="stylesheet" href="./css/dark-theme.css?v=5.2.2-rc.7" id="themelink" />
-  <link rel="stylesheet" href="./css/responsive.css?v=5.2.2-rc.7" />
+  <link rel="stylesheet" href="./css/common.css?v=5.2.3" />
+  <link rel="stylesheet" href="./css/dark-theme.css?v=5.2.3" id="themelink" />
+  <link rel="stylesheet" href="./css/responsive.css?v=5.2.3" />
   <title>Container Desktop</title>
 </head>
 
@@ -51,25 +51,25 @@ <h1>
     </div>
     <div class="downloadSection">
       <div class="download">
-        <a class="downloadButton" href="https://github.com/iongion/container-desktop/releases/download/5.2.2-rc.7/container-desktop-x86_64-5.2.2-rc.7.AppImage">
+        <a class="downloadButton" href="https://github.com/iongion/container-desktop/releases/download/5.2.3/container-desktop-x86_64-5.2.3.AppImage">
           <i class="fab fa-linux"></i>
           &nbsp;Download for Linux
         </a>
         <ul class="downloadBundles">
           <li>
-            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.2-rc.7/container-desktop-x86_64-5.2.2-rc.7.AppImage">AppImage</a>
+            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.3/container-desktop-x86_64-5.2.3.AppImage">AppImage</a>
           </li>
           <li>
-            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.2-rc.7/container-desktop-x86_64-5.2.2-rc.7.flatpak">flatpak</a>
+            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.3/container-desktop-x86_64-5.2.3.flatpak">flatpak</a>
           </li>
           <li>
-            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.2-rc.7/container-desktop-x86_64-5.2.2-rc.7.rpm">rpm</a>
+            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.3/container-desktop-x86_64-5.2.3.rpm">rpm</a>
           </li>
           <li>
-            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.2-rc.7/container-desktop-amd64-5.2.2-rc.7.deb">deb</a>
+            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.3/container-desktop-amd64-5.2.3.deb">deb</a>
           </li>
           <li>
-            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.2-rc.7/container-desktop-x64-5.2.2-rc.7.pacman">pacman</a>
+            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.3/container-desktop-x64-5.2.3.pacman">pacman</a>
           </li>
         </ul>
       </div>
@@ -80,22 +80,22 @@ <h1>
         </a>
         <ul class="downloadBundles">
           <li>
-            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.2-rc.7/container-desktop-installer.exe" target="_blank">Installer - exe</a>
+            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.3/container-desktop-installer.exe" target="_blank">Installer - exe</a>
           </li>
         </ul>
       </div>
       <div class="download">
-        <a class="downloadButton" href="https://github.com/iongion/container-desktop/releases/download/5.2.2-rc.7/container-desktop-x64-5.2.2-rc.7.dmg">
+        <a class="downloadButton" href="https://github.com/iongion/container-desktop/releases/download/5.2.3/container-desktop-x64-5.2.3.dmg">
           <i class="fab fa-apple"></i>
           &nbsp;Download for Mac
         </a>
         <ul class="downloadBundles">
           <li>Disk image</li>
           <li>
-            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.2-rc.7/container-desktop-x64-5.2.2-rc.7.dmg">Intel</a>
+            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.3/container-desktop-x64-5.2.3.dmg">Intel</a>
           </li>
           <li class="alternative">
-            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.2-rc.7/container-desktop-arm64-5.2.2-rc.7.dmg">Apple</a>
+            <a href="https://github.com/iongion/container-desktop/releases/download/5.2.3/container-desktop-arm64-5.2.3.dmg">Apple</a>
           </li>
         </ul>
       </div>

diff --git a/docs/privacy-policy.html b/docs/privacy-policy.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" data-version="5.2.2-rc.7">
+<html lang="en" data-version="5.2.3">
 
 <head>
   <meta charset="UTF-8" />1
@@ -13,9 +13,9 @@
   <link rel="preconnect" href="//fonts.googleapis.com" />
   <link rel="preconnect" href="//fonts.gstatic.com" crossorigin />
   <link rel="stylesheet" href="//fonts.googleapis.com/css2?family=Montserrat:wght@100;300;500;700&display=swap" />
-  <link rel="stylesheet" href="./css/common.css?v=5.2.2-rc.7" />
-  <link rel="stylesheet" href="./css/dark-theme.css?v=5.2.2-rc.7" id="themelink" />
-  <link rel="stylesheet" href="./css/responsive.css?v=5.2.2-rc.7" />
+  <link rel="stylesheet" href="./css/common.css?v=5.2.3" />
+  <link rel="stylesheet" href="./css/dark-theme.css?v=5.2.3" id="themelink" />
+  <link rel="stylesheet" href="./css/responsive.css?v=5.2.3" />
   <title>Container Desktop</title>
 </head>
 
@@ -40,4 +40,4 @@ <h1>Container Desktop<br />Privacy policy</h1>
 
 </body>
 
-</html>
+</html>
diff --git a/electron-builder-config.cjs b/electron-builder-config.cjs
@@ -1,11 +1,18 @@
-const path = require("path");
+const path = require("node:path");
+const os = require("node:os");
 // vendors
 const dayjs = require("dayjs");
 const dotenv = require("dotenv");
+const semver = require("semver");
 // pkg
 const pkg = require("./package.json");
 // module
-const artifactName = [pkg.name, "${arch}", pkg.version].join("-");
+const version = pkg.version;
+const semverVersion = semver.parse(version);
+// MAJOR.MIN.REV.BUILD for Windows Store compatibility
+const buildNumber = Number(process.env.BUILD_NUMBER || semverVersion.build[0] || semverVersion.prerelease[0][0] || 0);
+const buildVersion = `${semverVersion.major}.${semverVersion.minor}.${semverVersion.patch}.${buildNumber}`;
+const artifactName = [pkg.name, "${arch}", version].join("-");
 const ENVIRONMENT = process.env.ENVIRONMENT || "development";
 const PROJECT_HOME = path.resolve(__dirname);
 
@@ -21,11 +28,12 @@ const year = dayjs().format("YYYY");
 const identityName = "IonutStoica.ContainerDesktop";
 const applicationId = identityName;
 const displayName = pkg.title;
-const releaseName = `${displayName} ${pkg.version}`;
+const releaseName = `${displayName} ${version}`;
 const config = {
   appId: "container-desktop.iongion.github.io",
   productName: process.platform === "linux" ? pkg.name : displayName,
-  buildVersion: pkg.version,
+  buildNumber,
+  buildVersion,
   artifactName: artifactName + ".${ext}",
   copyright: `Copyright (c) ${year} ${pkg.author}`,
   releaseInfo: {
@@ -43,7 +51,9 @@ const config = {
   electronLanguages: ["en-US"],
   // includeSubNodeModule: false,
   extraMetadata: {
-    version: pkg.version,
+    version: buildVersion,
+    buildVersion,
+    buildNumber,
     main: pkg.main
   },
   directories: {
@@ -117,6 +127,7 @@ const config = {
     publisher: process.env.PUBLISHER || pkg.author,
     publisherDisplayName: process.env.PUBLISHER_DISPLAY_NAME || pkg.author,
     applicationId,
+    setBuildNumber: false, // Always false otherwise rejected by Windows Store
     displayName
   },
   linux: {

diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "container-desktop",
   "title": "Container Desktop",
-  "version": "5.2.2-rc.7",
+  "version": "5.2.3",
   "author": "Ionut Stoica <stoica.ionut@gmail.com>",
   "description": "Container Desktop",
-  "main": "build/main-5.2.2-rc.7.mjs",
+  "main": "build/main-5.2.3.mjs",
   "homepage": "./",
   "type": "module",
   "scripts": {

diff --git a/public/manifest.json b/public/manifest.json
@@ -11,5 +11,5 @@
   "manifest_version": 2,
   "name": "Podman desktop companion",
   "permissions": ["webNavigation"],
-  "version": "5.2.2-rc.7"
+  "version": "5.2.3"
 }
diff --git a/support/homebrew-cask/formula.json b/support/homebrew-cask/formula.json
@@ -60,35 +60,35 @@
   "tap": "homebrew/cask",
   "tap_git_head": "2e01e559350aa6f88679fcc94a5e74b90c432cc6",
   "token": "container-desktop",
-  "url": "https://github.com/iongion/container-desktop/releases/container-desktop-arm64-5.2.2-rc.7.dmg",
+  "url": "https://github.com/iongion/container-desktop/releases/container-desktop-arm64-5.2.3.dmg",
   "url_specs": {
     "verified": "github.com/iongion/container-desktop/"
   },
   "variations": {
     "big_sur": {
       "sha256": "1b8431448986e6b110c68166ba09dacc1f7e632ed21e398e2f94ab24d5328daf",
-      "url": "https://github.com/iongion/container-desktop/releases/container-desktop-x64-5.2.2-rc.7.dmg"
+      "url": "https://github.com/iongion/container-desktop/releases/container-desktop-x64-5.2.3.dmg"
     },
     "catalina": {
       "sha256": "1b8431448986e6b110c68166ba09dacc1f7e632ed21e398e2f94ab24d5328daf",
-      "url": "https://github.com/iongion/container-desktop/releases/container-desktop-x64-5.2.2-rc.7.dmg"
+      "url": "https://github.com/iongion/container-desktop/releases/container-desktop-x64-5.2.3.dmg"
     },
     "monterey": {
       "sha256": "1b8431448986e6b110c68166ba09dacc1f7e632ed21e398e2f94ab24d5328daf",
-      "url": "https://github.com/iongion/container-desktop/releases/container-desktop-x64-5.2.2-rc.7.dmg"
+      "url": "https://github.com/iongion/container-desktop/releases/container-desktop-x64-5.2.3.dmg"
     },
     "sequoia": {
       "sha256": "1b8431448986e6b110c68166ba09dacc1f7e632ed21e398e2f94ab24d5328daf",
-      "url": "https://github.com/iongion/container-desktop/releases/container-desktop-x64-5.2.2-rc.7.dmg"
+      "url": "https://github.com/iongion/container-desktop/releases/container-desktop-x64-5.2.3.dmg"
     },
     "sonoma": {
       "sha256": "1b8431448986e6b110c68166ba09dacc1f7e632ed21e398e2f94ab24d5328daf",
-      "url": "https://github.com/iongion/container-desktop/releases/container-desktop-x64-5.2.2-rc.7.dmg"
+      "url": "https://github.com/iongion/container-desktop/releases/container-desktop-x64-5.2.3.dmg"
     },
     "ventura": {
       "sha256": "1b8431448986e6b110c68166ba09dacc1f7e632ed21e398e2f94ab24d5328daf",
-      "url": "https://github.com/iongion/container-desktop/releases/container-desktop-x64-5.2.2-rc.7.dmg"
+      "url": "https://github.com/iongion/container-desktop/releases/container-desktop-x64-5.2.3.dmg"
     }
   },
-  "version": "5.2.2-rc.7"
+  "version": "5.2.3"
 }
diff --git a/support/homebrew-cask/podman-desktop-companion.rb b/support/homebrew-cask/podman-desktop-companion.rb
@@ -1,7 +1,7 @@
 cask "container-desktop" do
   arch arm: "arm64", intel: "x64"
 
-  version "5.2.2-rc.7"
+  version "5.2.3"
   sha256 arm:   "766e95f921ec223ade4ba06e82558a77cd890962f2a4e25d41a047d88c1b10bf",
          intel: "1b8431448986e6b110c68166ba09dacc1f7e632ed21e398e2f94ab24d5328daf"
 

diff --git a/tasks.py b/tasks.py
@@ -75,7 +75,7 @@ def gen_sign(ctx):
     with ctx.cd(path):
         run_env(ctx, f'java -jar "{jar_path}" --keystore ContainerDesktop.pfx --storetype PKCS12 --storepass "" --alias te-421f6152-2313-4a73-85bf-29bae289dbd8 --tsaurl "{ts_url}" "{app_path}"')
     # "C:\Program Files (x86)\Windows
-    #  Kits\10\bin\10.0.22000.0\x64\signtool.exe" sign /a /f "C:\Workspace\is\container-desktop\ContainerDesktop.pfx" /tr "http://ts.ssl.com" /td sha256 /fd sha256 /v "C:\Workspace\is\container-desktop\release\container-desktop-x64-5.2.2-rc.7.appx"
+    #  Kits\10\bin\10.0.22000.0\x64\signtool.exe" sign /a /f "C:\Workspace\is\container-desktop\ContainerDesktop.pfx" /tr "http://ts.ssl.com" /td sha256 /fd sha256 /v "C:\Workspace\is\container-desktop\release\container-desktop-x64-5.2.3.appx"
     # appx_path = os.path.join(path, "release", f"container-desktop-x64-{PROJECT_VERSION}.appx")
     # with ctx.cd(path):
     #     run_env(ctx, f'java -jar "{jar_path}" --keystore ContainerDesktop.pfx --storetype PKCS12 --storepass "" --alias te-421f6152-2313-4a73-85bf-29bae289dbd8 --tsaurl "{ts_url}" "{appx_path}"')