From 28619856de5de16ffb7a55a11d4fa3c9c4d13aea Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Fri, 14 Nov 2025 11:49:40 +0100 Subject: [PATCH 1/3] chore: adds dates --- ...und14_event.sql => 00001_fund15_event.sql} | 34 +++++++++---------- ...d14_params.sql => 00002_fund15_params.sql} | 10 +++--- 2 files changed, 22 insertions(+), 22 deletions(-) rename src/event-db/stage_data/dev/{00001_fund14_event.sql => 00001_fund15_event.sql} (75%) rename src/event-db/stage_data/dev/{00002_fund14_params.sql => 00002_fund15_params.sql} (96%) diff --git a/src/event-db/stage_data/dev/00001_fund14_event.sql b/src/event-db/stage_data/dev/00001_fund15_event.sql similarity index 75% rename from src/event-db/stage_data/dev/00001_fund14_event.sql rename to src/event-db/stage_data/dev/00001_fund15_event.sql index beee05daa1..7084cabd28 100644 --- a/src/event-db/stage_data/dev/00001_fund14_event.sql +++ b/src/event-db/stage_data/dev/00001_fund15_event.sql @@ -1,4 +1,4 @@ --- F14 +-- F15 INSERT INTO event ( row_id, name, @@ -26,25 +26,25 @@ INSERT INTO event ( extra, cast_to ) VALUES ( - 14, - 'Fund 14', - 'Catalyst Testnet - Fund 14', - '2025-09-06 21:45:00', -- Registration Snapshot Time - '2025-09-06 22:00:00', -- Snapshot Start. + 15, + 'Fund 15', + 'Catalyst Testnet - Fund 15', + '2025-11-10 10:00:00', -- Registration Snapshot Time + '2025-11-10 10:15:00', -- Snapshot Start. 25000000, -- Voting Power Threshold 100, -- Max Voting Power PCT NULL, -- Review Rewards - '2025-07-22 10:00:00', -- Start Time - '2025-10-27 07:00:00', -- End Time - '2025-07-22 10:00:00', -- Insight Sharing Start - '2025-07-22 10:00:00', -- Proposal Submission Start - '2025-07-22 10:00:00', -- Refine Proposals Start - '2025-07-22 10:00:00', -- Finalize Proposals Start - '2025-07-22 10:00:00', -- Proposal Assessment Start - '2025-07-22 10:00:00', -- Assessment QA Start - '2025-09-22 12:00:00', -- Voting Starts - '2025-10-06 11:00:00', -- Voting Ends - '2025-10-27 07:00:00', -- Tallying Ends + '2025-11-10 10:00:00', -- Start Time + '2026-02-15 07:00:00', -- End Time + '2025-11-10 10:00:00', -- Insight Sharing Start + '2025-11-10 10:00:00', -- Proposal Submission Start + '2025-11-10 10:00:00', -- Refine Proposals Start + '2025-11-10 10:00:00', -- Finalize Proposals Start + '2025-11-10 10:00:00', -- Proposal Assessment Start + '2025-11-10 10:00:00', -- Assessment QA Start + '2025-11-10 10:00:00', -- Voting Starts + '2026-01-25 11:00:00', -- Voting Ends + '2026-02-15 07:00:00', -- Tallying Ends NULL, -- Block 0 Data NULL, -- Block 0 Hash 1, -- Committee Size diff --git a/src/event-db/stage_data/dev/00002_fund14_params.sql b/src/event-db/stage_data/dev/00002_fund15_params.sql similarity index 96% rename from src/event-db/stage_data/dev/00002_fund14_params.sql rename to src/event-db/stage_data/dev/00002_fund15_params.sql index 19ef201573..133d56353a 100644 --- a/src/event-db/stage_data/dev/00002_fund14_params.sql +++ b/src/event-db/stage_data/dev/00002_fund15_params.sql @@ -1,7 +1,7 @@ --- Define F14 IdeaScale parameters. +-- Define F15 IdeaScale parameters. INSERT INTO config (id, id2, id3, value) VALUES ( 'ideascale', - '14', + '15', '', '{ "group_id": 31051, @@ -51,11 +51,11 @@ INSERT INTO config (id, id2, id3, value) VALUES ( ) ON CONFLICT (id, id2, id3) DO UPDATE SET value = EXCLUDED.value; --- Use F14 params for event with row_id = 14. +-- Use F15 params for event with row_id = 15. INSERT INTO config (id, id2, id3, value) VALUES ( 'event', 'ideascale_params', - '14', - '{"params_id": "F14"}' + '15', + '{"params_id": "F15"}' ) ON CONFLICT (id, id2, id3) DO UPDATE SET value = EXCLUDED.value; \ No newline at end of file From 25cd6c77d34010a9a9ed0613ee5619b08631602d Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Fri, 14 Nov 2025 12:15:09 +0100 Subject: [PATCH 2/3] fix apt error --- containers/event-db-migrations/Earthfile | 1 + 1 file changed, 1 insertion(+) diff --git a/containers/event-db-migrations/Earthfile b/containers/event-db-migrations/Earthfile index dcf43d07a5..b892513d98 100644 --- a/containers/event-db-migrations/Earthfile +++ b/containers/event-db-migrations/Earthfile @@ -21,6 +21,7 @@ package: # Add psql RUN apt-get update && apt-get install -y --no-install-recommends \ + apt \ wget \ gnupg2 \ ca-certificates \ From 7e65463534d08cb730a5cf99a91a3a7676854f72 Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Fri, 14 Nov 2025 13:27:36 +0100 Subject: [PATCH 3/3] fix aptkey --- containers/event-db-migrations/Earthfile | 48 ++++++++++++++++-------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/containers/event-db-migrations/Earthfile b/containers/event-db-migrations/Earthfile index b892513d98..606a4d69b5 100644 --- a/containers/event-db-migrations/Earthfile +++ b/containers/event-db-migrations/Earthfile @@ -20,21 +20,37 @@ package: WORKDIR /eventdb # Add psql - RUN apt-get update && apt-get install -y --no-install-recommends \ - apt \ - wget \ - gnupg2 \ - ca-certificates \ - lsb-release \ - apt-transport-https \ - && rm -rf /var/lib/apt/lists/* && \ - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ - echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \ - apt-get update && \ - apt-get install -y --no-install-recommends postgresql-14 && \ - apt-get remove -y wget gnupg2 lsb-release apt-transport-https && \ - apt-get autoremove -y && \ - apt-get clean && rm -rf /var/lib/apt/lists/* + RUN apt-get update && \ + # Install dependencies needed for adding the key and postgres + apt-get install -y --no-install-recommends \ + wget \ + gnupg2 \ + ca-certificates \ + lsb-release \ + apt-transport-https && \ + \ + # Create the keyring directory + install -m 0755 -d /etc/apt/keyrings && \ + \ + # Download, de-armor, and save the PostgreSQL key + wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \ + gpg --dearmor -o /etc/apt/keyrings/postgresql.gpg && \ + \ + # Set permissions for the key + chmod 644 /etc/apt/keyrings/postgresql.gpg && \ + \ + # Create the sources list, pointing to the key + echo "deb [signed-by=/etc/apt/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \ + \ + # Update apt and install postgresql + apt-get update && \ + apt-get install -y --no-install-recommends postgresql-14 && \ + \ + # Clean up + apt-get remove -y wget gnupg2 lsb-release apt-transport-https && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* # Add refinery COPY +build/refinery . @@ -56,7 +72,7 @@ package: ENTRYPOINT ["./entry.sh"] SAVE IMAGE migrations:$tag - + # TODO: Enable this when CI supports passing -P dynamically # test: # FROM earthly/dind:alpine