fix: maker contructor arguments

SiaFoundation · Dec 10, 2024 · cc55d3b · cc55d3b
1 parent 115f35f
commit cc55d3b
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 66 deletions.
diff --git a/.changeset/alpha-beta-charlie.md b/.changeset/alpha-beta-charlie.md
@@ -0,0 +1,7 @@
+---
+'hostd': patch
+'renterd': patch
+'walletd': patch
+---
+
+Fixed an issue with the publishing workflow that meant some app configuration was not being applied.
diff --git a/hostd/forge.config.js b/hostd/forge.config.js
@@ -9,9 +9,8 @@ const { execFileSync } = require('child_process')
 const fs = require('fs')
 const path = require('path')
 
-const makerSquirrel = new MakerSquirrel({
-  platforms: ['win32'],
-  config: (arch) => ({
+const makerSquirrel = new MakerSquirrel(
+  (arch) => ({
     // There is currently an issue with deltas.
     // Issue: System.IO.FileNotFoundException: The base package release does not exist
     noDelta: true,
@@ -21,40 +20,41 @@ const makerSquirrel = new MakerSquirrel({
     // The ICO file to use as the icon for the generated Setup.exe
     setupIcon: './assets/icons/icon.ico',
   }),
-})
-const makerZIP = new MakerZIP({
-  platforms: ['darwin'],
-  config: (arch) => ({
+  ['win32']
+)
+const makerZIP = new MakerZIP(
+  (arch) => ({
     macUpdateManifestBaseUrl: `https://releases.sia.tools/hostd/darwin/${arch}`,
     options: {
       icon: './assets/icons/icon.icns',
     },
   }),
-})
-const makerDMG = new MakerDMG({
-  platforms: ['darwin'],
-  config: (arch) => ({
+  ['darwin']
+)
+const makerDMG = new MakerDMG(
+  (arch) => ({
     name: `hostd-${arch}`,
     icon: './assets/icons/icon.icns',
     format: 'ULFO',
   }),
-})
-const makerDeb = new MakerDeb({
-  platforms: ['linux'],
-  config: {
+  ['darwin']
+)
+const makerDeb = new MakerDeb(
+  {
     options: {
       icon: './assets/icons/icon.png',
     },
   },
-})
-const makerRPM = new MakerRpm({
-  platforms: ['linux'],
-  config: {
+  ['linux']
+)
+const makerRPM = new MakerRpm(
+  {
     options: {
       icon: './assets/icons/icon.png',
     },
   },
-})
+  ['linux']
+)
 
 // THIS FIX IS TAKEN FROM: https://github.com/kando-menu/kando/pull/700/files
 // > Below comes an evil hack to fix this issue: https://github.com/kando-menu/kando/issues/502

diff --git a/hostd/package-lock.json b/hostd/package-lock.json
diff --git a/renterd/forge.config.js b/renterd/forge.config.js
@@ -9,9 +9,8 @@ const { execFileSync } = require('child_process')
 const fs = require('fs')
 const path = require('path')
 
-const makerSquirrel = new MakerSquirrel({
-  platforms: ['win32'],
-  config: (arch) => ({
+const makerSquirrel = new MakerSquirrel(
+  (arch) => ({
     // There is currently an issue with deltas.
     // Issue: System.IO.FileNotFoundException: The base package release does not exist
     noDelta: true,
@@ -21,40 +20,41 @@ const makerSquirrel = new MakerSquirrel({
     // The ICO file to use as the icon for the generated Setup.exe
     setupIcon: './assets/icons/icon.ico',
   }),
-})
-const makerZIP = new MakerZIP({
-  platforms: ['darwin'],
-  config: (arch) => ({
+  ['win32']
+)
+const makerZIP = new MakerZIP(
+  (arch) => ({
     macUpdateManifestBaseUrl: `https://releases.sia.tools/renterd/darwin/${arch}`,
     options: {
       icon: './assets/icons/icon.icns',
     },
   }),
-})
-const makerDMG = new MakerDMG({
-  platforms: ['darwin'],
-  config: (arch) => ({
+  ['darwin']
+)
+const makerDMG = new MakerDMG(
+  (arch) => ({
     name: `renterd-${arch}`,
     icon: './assets/icons/icon.icns',
     format: 'ULFO',
   }),
-})
-const makerDeb = new MakerDeb({
-  platforms: ['linux'],
-  config: {
+  ['darwin']
+)
+const makerDeb = new MakerDeb(
+  {
     options: {
       icon: './assets/icons/icon.png',
     },
   },
-})
-const makerRPM = new MakerRpm({
-  platforms: ['linux'],
-  config: {
+  ['linux']
+)
+const makerRPM = new MakerRpm(
+  {
     options: {
       icon: './assets/icons/icon.png',
     },
   },
-})
+  ['linux']
+)
 
 // THIS FIX IS TAKEN FROM: https://github.com/kando-menu/kando/pull/700/files
 // > Below comes an evil hack to fix this issue: https://github.com/kando-menu/kando/issues/502

diff --git a/renterd/package-lock.json b/renterd/package-lock.json
diff --git a/walletd/forge.config.js b/walletd/forge.config.js
@@ -9,9 +9,8 @@ const { execFileSync } = require('child_process')
 const fs = require('fs')
 const path = require('path')
 
-const makerSquirrel = new MakerSquirrel({
-  platforms: ['win32'],
-  config: (arch) => ({
+const makerSquirrel = new MakerSquirrel(
+  (arch) => ({
     // There is currently an issue with deltas.
     // Issue: System.IO.FileNotFoundException: The base package release does not exist
     noDelta: true,
@@ -21,40 +20,41 @@ const makerSquirrel = new MakerSquirrel({
     // The ICO file to use as the icon for the generated Setup.exe
     setupIcon: './assets/icons/icon.ico',
   }),
-})
-const makerZIP = new MakerZIP({
-  platforms: ['darwin'],
-  config: (arch) => ({
+  ['win32']
+)
+const makerZIP = new MakerZIP(
+  (arch) => ({
     macUpdateManifestBaseUrl: `https://releases.sia.tools/walletd/darwin/${arch}`,
     options: {
       icon: './assets/icons/icon.icns',
     },
   }),
-})
-const makerDMG = new MakerDMG({
-  platforms: ['darwin'],
-  config: (arch) => ({
+  ['darwin']
+)
+const makerDMG = new MakerDMG(
+  (arch) => ({
     name: `walletd-${arch}`,
     icon: './assets/icons/icon.icns',
     format: 'ULFO',
   }),
-})
-const makerDeb = new MakerDeb({
-  platforms: ['linux'],
-  config: {
+  ['darwin']
+)
+const makerDeb = new MakerDeb(
+  {
     options: {
       icon: './assets/icons/icon.png',
     },
   },
-})
-const makerRPM = new MakerRpm({
-  platforms: ['linux'],
-  config: {
+  ['linux']
+)
+const makerRPM = new MakerRpm(
+  {
     options: {
       icon: './assets/icons/icon.png',
     },
   },
-})
+  ['linux']
+)
 
 // THIS FIX IS TAKEN FROM: https://github.com/kando-menu/kando/pull/700/files
 // > Below comes an evil hack to fix this issue: https://github.com/kando-menu/kando/issues/502

diff --git a/walletd/package-lock.json b/walletd/package-lock.json