From ccbf4e2f8b42eb13799d82814fd818812eacc504 Mon Sep 17 00:00:00 2001
From: Horacio Herrera <hi@horacioh.com>
Date: Tue, 10 Dec 2024 13:35:38 -0500
Subject: [PATCH] ubuntu-latest + real s3

---
 .github/actions/ci-setup/action.yml       |  6 +++---
 .github/workflows/desktop-dev-release.yml | 10 +++++-----
 .github/workflows/desktop-release.yml     |  2 +-
 .github/workflows/test-desktop.yml        |  2 +-
 frontend/apps/desktop/forge.config.ts     | 12 ++++++------
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/actions/ci-setup/action.yml b/.github/actions/ci-setup/action.yml
index 86ed71e7..52af4c77 100644
--- a/.github/actions/ci-setup/action.yml
+++ b/.github/actions/ci-setup/action.yml
@@ -24,7 +24,7 @@ runs:
         go-version: "1.23.3"
 
     - name: "Install native packages"
-      if: inputs.matrix-os == 'ubuntu-24.04'
+      if: inputs.matrix-os == 'ubuntu-latest'
       run: |
         sudo apt-get update
         sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf rpm
@@ -34,14 +34,14 @@ runs:
     # flatpak gnome-software-plugin-flatpak flatpak-builder elfutils
 
     # - name: "Setup Flatpak"
-    #   if: inputs.matrix-os == 'ubuntu-24.04'
+    #   if: inputs.matrix-os == 'ubuntu-latest'
     #   run: |
     #     sudo flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
     #   shell: bash
 
     - name: Setup cache Ubuntu
       uses: actions/cache@v3
-      if: inputs.matrix-os == 'ubuntu-24.04'
+      if: inputs.matrix-os == 'ubuntu-latest'
       with:
         path: |
           ~/.cache/go-build
diff --git a/.github/workflows/desktop-dev-release.yml b/.github/workflows/desktop-dev-release.yml
index 2e834ac5..9e84ccc5 100644
--- a/.github/workflows/desktop-dev-release.yml
+++ b/.github/workflows/desktop-dev-release.yml
@@ -74,7 +74,7 @@ jobs:
             arch: arm64
             goarch: arm64
             daemon_name: aarch64-apple-darwin
-          - os: ubuntu-24.04
+          - os: ubuntu-latest
             arch: x64
             goarch: amd64
             daemon_name: x86_64-unknown-linux-gnu
@@ -152,8 +152,8 @@ jobs:
           VITE_GATEWAY_URL: "https://dev.hyper.media"
           VITE_DESKTOP_SENTRY_DSN: "${{ secrets.DESKTOP_SENTRY_DSN }}"
           SENTRY_AUTH_TOKEN: "${{ secrets.SENTRY_AUTH_TOKEN }}"
-          TEMP_S3_ACCESS_KEY: ${{ secrets.TEMP_S3_ACCESS_KEY }}
-          TEMP_S3_SECRET_KEY: ${{ secrets.TEMP_S3_SECRET_KEY }}
+          S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+          S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
@@ -179,6 +179,6 @@ jobs:
           VITE_GATEWAY_URL: "https://dev.hyper.media"
           VITE_DESKTOP_SENTRY_DSN: "${{ secrets.DESKTOP_SENTRY_DSN }}"
           SENTRY_AUTH_TOKEN: "${{ secrets.SENTRY_AUTH_TOKEN }}"
-          TEMP_S3_ACCESS_KEY: ${{ secrets.TEMP_S3_ACCESS_KEY }}
-          TEMP_S3_SECRET_KEY: ${{ secrets.TEMP_S3_SECRET_KEY }}
+          S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+          S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
           SEED_P2P_TESTNET_NAME: "dev"
diff --git a/.github/workflows/desktop-release.yml b/.github/workflows/desktop-release.yml
index ec6cc42c..10110e51 100644
--- a/.github/workflows/desktop-release.yml
+++ b/.github/workflows/desktop-release.yml
@@ -71,7 +71,7 @@ jobs:
             arch: arm64
             goarch: arm64
             daemon_name: aarch64-apple-darwin
-          - os: ubuntu-24.04
+          - os: ubuntu-latest
             arch: x64
             goarch: amd64
             daemon_name: x86_64-unknown-linux-gnu
diff --git a/.github/workflows/test-desktop.yml b/.github/workflows/test-desktop.yml
index 3c554f27..7703b68d 100644
--- a/.github/workflows/test-desktop.yml
+++ b/.github/workflows/test-desktop.yml
@@ -42,7 +42,7 @@ jobs:
             arch: arm64
             goarch: arm64
             daemon_name: aarch64-apple-darwin
-          - os: ubuntu-24.04
+          - os: ubuntu-latest
             arch: x64
             goarch: amd64
             daemon_name: x86_64-unknown-linux-gnu
diff --git a/frontend/apps/desktop/forge.config.ts b/frontend/apps/desktop/forge.config.ts
index b25bda07..b4291da2 100644
--- a/frontend/apps/desktop/forge.config.ts
+++ b/frontend/apps/desktop/forge.config.ts
@@ -158,9 +158,9 @@ function addPublishers() {
 
   config.publishers?.push(
     new PublisherS3({
-      bucket: 'seed-demo',
-      accessKeyId: process.env.TEMP_S3_ACCESS_KEY,
-      secretAccessKey: process.env.TEMP_S3_SECRET_KEY,
+      bucket: 'seedappdev',
+      accessKeyId: process.env.S3_ACCESS_KEY,
+      secretAccessKey: process.env.S3_SECRET_KEY,
       folder: 'dev',
       omitAcl: true,
       public: true,
@@ -178,9 +178,9 @@ function addPublishers() {
       // },
     }),
     new PublisherS3({
-      bucket: 'seed-demo',
-      accessKeyId: process.env.TEMP_S3_ACCESS_KEY,
-      secretAccessKey: process.env.TEMP_S3_SECRET_KEY,
+      bucket: 'seedappdev',
+      accessKeyId: process.env.S3_ACCESS_KEY,
+      secretAccessKey: process.env.S3_SECRET_KEY,
       folder: 'dev',
       omitAcl: true,
       public: true,