From 95b0277fefd24680bf04f1420cc979e5950a8dad Mon Sep 17 00:00:00 2001 From: atticusofsparta Date: Mon, 5 Aug 2024 11:40:01 -0600 Subject: [PATCH 1/7] fix(evolve): add missing imports --- .github/workflows/build_test_evolve.yaml | 2 +- tools/evolve.js | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_test_evolve.yaml b/.github/workflows/build_test_evolve.yaml index 86e2ae4..e537b00 100644 --- a/.github/workflows/build_test_evolve.yaml +++ b/.github/workflows/build_test_evolve.yaml @@ -1,6 +1,6 @@ name: Build and Test -on: [push] +on: [push, workflow_dispatch] jobs: # TODO: add unit tests using bused diff --git a/tools/evolve.js b/tools/evolve.js index ba9de01..8a24a58 100644 --- a/tools/evolve.js +++ b/tools/evolve.js @@ -1,8 +1,9 @@ -import { AOProcess, createAoSigner } from '@ar.io/sdk'; -import { BUNDLED_AOS_LUA } from './constants'; +import { AOProcess, createAoSigner, ArweaveSigner } from '@ar.io/sdk'; +import { BUNDLED_AOS_LUA } from './constants.js'; const registryId = process.env.REGISTRY_ID; const wallet = JSON.parse(process.env.WALLET); + const process = new AOProcess({ processId: registryId }); const signer = createAoSigner(new ArweaveSigner(wallet)); @@ -12,4 +13,4 @@ const evolveResult = await process.send({ data: BUNDLED_AOS_LUA, signer, }); -console.log(`Evolve result: ${evolveResult}`); +console.log(`Evolve result: ${JSON.stringify(evolveResult)}`); From cf8e4840847c314fb1416e91166bfdd720f62f18 Mon Sep 17 00:00:00 2001 From: atticusofsparta Date: Mon, 5 Aug 2024 11:56:40 -0600 Subject: [PATCH 2/7] fix(action): remove main req for tesint --- .github/workflows/build_test_evolve.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_test_evolve.yaml b/.github/workflows/build_test_evolve.yaml index e537b00..c93511f 100644 --- a/.github/workflows/build_test_evolve.yaml +++ b/.github/workflows/build_test_evolve.yaml @@ -19,7 +19,8 @@ jobs: evolve: # Run on main branch only runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' + # TODO: re-enable after testing workflow + # if: github.ref == 'refs/heads/main' needs: integration steps: - uses: actions/checkout@v4 From 950afa811e82397230e1cf331ff8f6b7b53a5710 Mon Sep 17 00:00:00 2001 From: atticusofsparta Date: Mon, 5 Aug 2024 11:58:29 -0600 Subject: [PATCH 3/7] fix(action): import process --- tools/evolve.js | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/evolve.js b/tools/evolve.js index 8a24a58..fdf7021 100644 --- a/tools/evolve.js +++ b/tools/evolve.js @@ -1,5 +1,6 @@ import { AOProcess, createAoSigner, ArweaveSigner } from '@ar.io/sdk'; import { BUNDLED_AOS_LUA } from './constants.js'; +import process from 'process'; const registryId = process.env.REGISTRY_ID; const wallet = JSON.parse(process.env.WALLET); From 3e8db9fb48eb930fa628881ceda18f0aa9b5694a Mon Sep 17 00:00:00 2001 From: atticusofsparta Date: Mon, 5 Aug 2024 11:59:52 -0600 Subject: [PATCH 4/7] fix(naming): remove name clash --- tools/evolve.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/evolve.js b/tools/evolve.js index fdf7021..2cc7772 100644 --- a/tools/evolve.js +++ b/tools/evolve.js @@ -5,11 +5,11 @@ import process from 'process'; const registryId = process.env.REGISTRY_ID; const wallet = JSON.parse(process.env.WALLET); -const process = new AOProcess({ processId: registryId }); +const registry = new AOProcess({ processId: registryId }); const signer = createAoSigner(new ArweaveSigner(wallet)); -const evolveResult = await process.send({ +const evolveResult = await registry.send({ tags: [{ name: 'Action', value: 'Eval' }], data: BUNDLED_AOS_LUA, signer, From eb71547de4e672a7a87e3167adbd9f5424f8617d Mon Sep 17 00:00:00 2001 From: atticusofsparta Date: Mon, 5 Aug 2024 12:01:27 -0600 Subject: [PATCH 5/7] fix(action): set environment --- .github/workflows/build_test_evolve.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_test_evolve.yaml b/.github/workflows/build_test_evolve.yaml index c93511f..40a4b90 100644 --- a/.github/workflows/build_test_evolve.yaml +++ b/.github/workflows/build_test_evolve.yaml @@ -22,6 +22,7 @@ jobs: # TODO: re-enable after testing workflow # if: github.ref == 'refs/heads/main' needs: integration + environment: development steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4.0.2 From 755eb694a1463728ba4cc7516bb9c36bc3aca4a4 Mon Sep 17 00:00:00 2001 From: atticusofsparta Date: Mon, 5 Aug 2024 12:10:50 -0600 Subject: [PATCH 6/7] fix(action): switch to use vars on registry id --- .github/workflows/build_test_evolve.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_test_evolve.yaml b/.github/workflows/build_test_evolve.yaml index 40a4b90..b8ad2e8 100644 --- a/.github/workflows/build_test_evolve.yaml +++ b/.github/workflows/build_test_evolve.yaml @@ -22,7 +22,6 @@ jobs: # TODO: re-enable after testing workflow # if: github.ref == 'refs/heads/main' needs: integration - environment: development steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4.0.2 @@ -33,4 +32,4 @@ jobs: - run: yarn evolve env: WALLET: ${{ secrets.WALLET }} - REGISTRY_ID: ${{ secrets.REGISTRY_ID }} + REGISTRY_ID: ${{ vars.REGISTRY_ID }} From 5913790f22784a499d06b79692ae8480d178e435 Mon Sep 17 00:00:00 2001 From: atticusofsparta Date: Mon, 5 Aug 2024 12:12:37 -0600 Subject: [PATCH 7/7] fix(action): add main branch check --- .github/workflows/build_test_evolve.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_test_evolve.yaml b/.github/workflows/build_test_evolve.yaml index b8ad2e8..87fbe4e 100644 --- a/.github/workflows/build_test_evolve.yaml +++ b/.github/workflows/build_test_evolve.yaml @@ -19,8 +19,7 @@ jobs: evolve: # Run on main branch only runs-on: ubuntu-latest - # TODO: re-enable after testing workflow - # if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/main' needs: integration steps: - uses: actions/checkout@v4