add arch support, update bucket

SiaFoundation · Jan 31, 2024 · 6cf5dac · 6cf5dac
1 parent 39bbbff
commit 6cf5dac
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 22 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -53,7 +53,7 @@ jobs:
           APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
           APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
           APPLE_API_KEY_PATH: ${{ env.APPLE_API_KEY_PATH }}
-        run: yarn workspace ${{ matrix.app }} make
+        run: yarn workspace ${{ matrix.app }} make --arch=arm64,x64
         shell: bash
   linux:
     strategy:
@@ -70,7 +70,7 @@ jobs:
         run: yarn workspace ${{ matrix.app }} build
         shell: bash
       - name: Package executable bundles, make distributables
-        run: yarn workspace ${{ matrix.app }} make
+        run: yarn workspace ${{ matrix.app }} make --arch=arm64,x64
         shell: bash
   windows:
     strategy:
@@ -90,7 +90,7 @@ jobs:
         shell: bash
       - name: Package executable bundles, sign and notarize, make distributables
         run: |
-          yarn workspace ${{ matrix.app }} make
+          yarn workspace ${{ matrix.app }} make --arch=x64
           # #TODO: probably not correct
           # APP_PATH="out/${{ matrix.app }}-win32-x64/${{ matrix.app }}.app"
           # BINARY_PATH="$APP_PATH/Contents/Windows/${{ matrix.app }}.exe"

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -57,7 +57,7 @@ jobs:
           BUCKET_ACCESS_KEY_ID: ${{ secrets.BUCKET_ACCESS_KEY_ID }}
           BUCKET_SECRET_ACCESS_KEY: ${{ secrets.BUCKET_SECRET_ACCESS_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: yarn workspace ${{ matrix.app }} publish
+        run: yarn workspace ${{ matrix.app }} publish --arch=arm64,x64
         shell: bash
   linux:
     strategy:
@@ -78,7 +78,7 @@ jobs:
           BUCKET_ACCESS_KEY_ID: ${{ secrets.BUCKET_ACCESS_KEY_ID }}
           BUCKET_SECRET_ACCESS_KEY: ${{ secrets.BUCKET_SECRET_ACCESS_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: yarn workspace ${{ matrix.app }} publish
+        run: yarn workspace ${{ matrix.app }} publish --arch=arm64,x64
         shell: bash
   windows:
     strategy:
@@ -102,7 +102,7 @@ jobs:
           BUCKET_SECRET_ACCESS_KEY: ${{ secrets.BUCKET_SECRET_ACCESS_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          yarn workspace ${{ matrix.app }} publish
+          yarn workspace ${{ matrix.app }} publish --arch=x64
           # #TODO: probably not correct
           # APP_PATH="out/${{ matrix.app }}-win32-x64/${{ matrix.app }}.app"
           # BINARY_PATH="$APP_PATH/Contents/Windows/${{ matrix.app }}.exe"

diff --git a/hostd/electron-src/index.ts b/hostd/electron-src/index.ts
@@ -13,7 +13,7 @@ import { UpdateSourceType, updateElectronApp } from 'update-electron-app'
 updateElectronApp({
   updateSource: {
     type: UpdateSourceType.StaticStorage,
-    baseUrl: `https://public.s3.file.dev/hostd/${process.platform}/${process.arch}`,
+    baseUrl: `https://releases.s3.file.dev/hostd/${process.platform}/${process.arch}`,
   },
 })
 

diff --git a/hostd/forge.config.js b/hostd/forge.config.js
@@ -28,9 +28,8 @@ module.exports = {
     {
       name: '@electron-forge/maker-squirrel',
       platforms: ['win32'],
-      // arch: ['x64'],
       config: (arch) => ({
-        remoteReleases: `https://public.s3.file.dev/hostd/win32/${arch}`,
+        remoteReleases: `https://releases.s3.file.dev/hostd/win32/${arch}`,
         // An URL to an ICO file to use as the application icon (displayed in Control Panel > Programs and Features).
         iconUrl: 'https://sia.tech/assets/appicon.ico',
         // The ICO file to use as the icon for the generated Setup.exe
@@ -40,9 +39,8 @@ module.exports = {
     {
       name: '@electron-forge/maker-zip',
       platforms: ['darwin'],
-      // arch: ['arm64', 'x64'],
       config: (arch) => ({
-        macUpdateManifestBaseUrl: `https://public.s3.file.dev/hostd/darwin/${arch}`,
+        macUpdateManifestBaseUrl: `https://releases.s3.file.dev/hostd/darwin/${arch}`,
         options: {
           icon: './assets/icons/icon.icns',
         },
@@ -51,7 +49,6 @@ module.exports = {
     {
       name: '@electron-forge/maker-deb',
       platforms: ['linux'],
-      // arch: ['arm64', 'x64'],
       config: {
         options: {
           icon: './assets/icons/icon.png',
@@ -61,7 +58,6 @@ module.exports = {
     {
       name: '@electron-forge/maker-rpm',
       platforms: ['linux'],
-      // arch: ['arm64', 'x64'],
       config: {
         options: {
           icon: './assets/icons/icon.png',
@@ -81,7 +77,7 @@ module.exports = {
       config: {
         public: true,
         region: 'us-east-1',
-        bucket: 'public',
+        bucket: 'releases',
         endpoint: 'https://s3.file.dev',
         accessKeyId: process.env.BUCKET_ACCESS_KEY_ID,
         secretAccessKey: process.env.BUCKET_SECRET_ACCESS_KEY,

diff --git a/renterd/electron-src/index.ts b/renterd/electron-src/index.ts
@@ -13,7 +13,7 @@ import { UpdateSourceType, updateElectronApp } from 'update-electron-app'
 updateElectronApp({
   updateSource: {
     type: UpdateSourceType.StaticStorage,
-    baseUrl: `https://public.s3.file.dev/renterd/${process.platform}/${process.arch}`,
+    baseUrl: `https://releases.s3.file.dev/renterd/${process.platform}/${process.arch}`,
   },
 })
 

diff --git a/renterd/forge.config.js b/renterd/forge.config.js
@@ -28,9 +28,8 @@ module.exports = {
     {
       name: '@electron-forge/maker-squirrel',
       platforms: ['win32'],
-      // arch: ['x64'],
       config: (arch) => ({
-        remoteReleases: `https://public.s3.file.dev/renterd/win32/${arch}`,
+        remoteReleases: `https://releases.s3.file.dev/renterd/win32/${arch}`,
         // An URL to an ICO file to use as the application icon (displayed in Control Panel > Programs and Features).
         iconUrl: 'https://sia.tech/assets/appicon.ico',
         // The ICO file to use as the icon for the generated Setup.exe
@@ -40,9 +39,8 @@ module.exports = {
     {
       name: '@electron-forge/maker-zip',
       platforms: ['darwin'],
-      // arch: ['arm64', 'x64'],
       config: (arch) => ({
-        macUpdateManifestBaseUrl: `https://public.s3.file.dev/renterd/darwin/${arch}`,
+        macUpdateManifestBaseUrl: `https://releases.s3.file.dev/renterd/darwin/${arch}`,
         options: {
           icon: './assets/icons/icon.icns',
         },
@@ -51,7 +49,6 @@ module.exports = {
     {
       name: '@electron-forge/maker-deb',
       platforms: ['linux'],
-      // arch: ['arm64', 'x64'],
       config: {
         options: {
           icon: './assets/icons/icon.png',
@@ -61,7 +58,6 @@ module.exports = {
     {
       name: '@electron-forge/maker-rpm',
       platforms: ['linux'],
-      // arch: ['arm64', 'x64'],
       config: {
         options: {
           icon: './assets/icons/icon.png',
@@ -81,7 +77,7 @@ module.exports = {
       config: {
         public: true,
         region: 'us-east-1',
-        bucket: 'public',
+        bucket: 'releases',
         endpoint: 'https://s3.file.dev',
         accessKeyId: process.env.BUCKET_ACCESS_KEY_ID,
         secretAccessKey: process.env.BUCKET_SECRET_ACCESS_KEY,