From e7a9a93bb0e15dffb6e3280aba14d37658db8e7e Mon Sep 17 00:00:00 2001 From: Marcin Gordel Date: Thu, 28 Sep 2023 10:28:55 +0200 Subject: [PATCH 01/13] test(examples): fixed release workflow --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 54a2349b6..6f8dc4dce 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -81,6 +81,8 @@ jobs: run: | npm install npm run build + npm install --prefix examples + npm install ts-node - name: Configure python uses: actions/setup-python@v4 From cafc736d8573a9a131a34f0ae95d0d31b05d5f17 Mon Sep 17 00:00:00 2001 From: jalas167 Date: Thu, 28 Sep 2023 20:02:06 +0200 Subject: [PATCH 02/13] test(examples) changed examples to run on testnet --- .../examples/selecting-providers/custom-price.mjs | 2 +- .../examples/selecting-providers/whitelist.mjs | 9 ++++++++- .../docs-examples/examples/working-with-images/tag.mjs | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/examples/docs-examples/examples/selecting-providers/custom-price.mjs b/examples/docs-examples/examples/selecting-providers/custom-price.mjs index ce6db0f37..b3e785812 100644 --- a/examples/docs-examples/examples/selecting-providers/custom-price.mjs +++ b/examples/docs-examples/examples/selecting-providers/custom-price.mjs @@ -16,7 +16,7 @@ const myFilter = async (proposal) => { else { costData.shift(); let averageProposedCost = costData.reduce((part, x) => part + x, 0) / 10; - if (proposedCost <= averageProposedCost) decision = true; + if (proposedCost <= 1.2 * averageProposedCost) decision = true; if (decision) { console.log(proposedCost, averageProposedCost); } diff --git a/examples/docs-examples/examples/selecting-providers/whitelist.mjs b/examples/docs-examples/examples/selecting-providers/whitelist.mjs index 202c8c454..e25dd6e1e 100644 --- a/examples/docs-examples/examples/selecting-providers/whitelist.mjs +++ b/examples/docs-examples/examples/selecting-providers/whitelist.mjs @@ -5,7 +5,14 @@ import { TaskExecutor, ProposalFilters } from "@golem-sdk/golem-js"; * which only allows offers from a provider whose ID is in the array */ -const whiteListIds = ["0x3fc1d65ddc5258dc8807df30a29f71028e965e1b", "0x4506550de84d207f3ab90add6336f68119015836"]; +const whiteListIds = [ + "0x3a21c608925ddbc745afab6375d1f5e77283538e", + "0xd79f83f1108d1fcbe0cf57e13b452305eb38a325", + "0x677c5476f3b0e1f03d5c3abd2e2e2231e36fddde", + "0x06c03165aaa676680b9d02c1f3ee846c3806fec7", + "0x17ec8597ff92c3f44523bdc65bf0f1be632917ff", // goth provider-1: + "0x63fc2ad3d021a4d7e64323529a55a9442c444da0" // goth provider-2: +]; console.log("Will accept only proposals from:"); for (let i = 0; i < whiteListIds.length; i++) { console.log(whiteListIds[i]); diff --git a/examples/docs-examples/examples/working-with-images/tag.mjs b/examples/docs-examples/examples/working-with-images/tag.mjs index aae331455..a7cb628a7 100644 --- a/examples/docs-examples/examples/working-with-images/tag.mjs +++ b/examples/docs-examples/examples/working-with-images/tag.mjs @@ -3,7 +3,7 @@ import { TaskExecutor } from "@golem-sdk/golem-js"; (async () => { const executor = await TaskExecutor.create({ package: "golem/alpine:latest", - yagnaOptions: { appKey: "try_golem" }, + yagnaOptions: { apiKey: "try_golem" }, }); const result = await executor.run(async (ctx) => (await ctx.run("node -v")).stdout); From f943a371afb027e20aa8535c80e5ee78737de079 Mon Sep 17 00:00:00 2001 From: Marcin Gordel Date: Wed, 27 Sep 2023 13:31:08 +0200 Subject: [PATCH 03/13] fix(work_context): added transfer and getIp commands to the work context api JST-460 and JST-408 --- src/task/batch.spec.ts | 12 +++++++++++- src/task/batch.ts | 7 ++++++- src/task/work.spec.ts | 28 +++++++++++++++++++++++++++- src/task/work.ts | 19 ++++++++++++++++++- tests/e2e/tasks.spec.ts | 27 +++++++++++++++++++++++++++ tests/mock/fixtures/test.txt | 1 + 6 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 tests/mock/fixtures/test.txt diff --git a/src/task/batch.spec.ts b/src/task/batch.spec.ts index 8dd8c2461..6cbbbebd6 100644 --- a/src/task/batch.spec.ts +++ b/src/task/batch.spec.ts @@ -1,4 +1,4 @@ -import { DownloadFile, Run, UploadData, UploadFile } from "../script"; +import { DownloadFile, Run, Transfer, UploadData, UploadFile } from "../script"; import { Batch } from "./batch"; import { NullStorageProvider } from "../storage"; import { ActivityMock } from "../../tests/mock/activity.mock"; @@ -28,6 +28,16 @@ describe("Batch", () => { }); }); + describe("transfer()", () => { + it("should add transfer file command", async () => { + expect(batch.transfer("http://golem.network/test.txt", "/golem/file.txt")).toBe(batch); + const cmd = batch["script"]["commands"][0] as Transfer; + expect(cmd).toBeInstanceOf(Transfer); + expect(cmd["from"]).toBe("http://golem.network/test.txt"); + expect(cmd["to"]).toBe("/golem/file.txt"); + }); + }); + describe("uploadFile()", () => { it("should add upload file command", async () => { expect(batch.uploadFile("/tmp/file.txt", "/golem/file.txt")).toBe(batch); diff --git a/src/task/batch.ts b/src/task/batch.ts index a2d173cf2..0bfde823f 100644 --- a/src/task/batch.ts +++ b/src/task/batch.ts @@ -1,4 +1,4 @@ -import { DownloadFile, Run, Script, UploadFile } from "../script"; +import { DownloadFile, Run, Script, Transfer, UploadFile } from "../script"; import { Activity, Result } from "../activity"; import { StorageProvider } from "../storage/provider"; import { Logger, sleep } from "../utils"; @@ -44,6 +44,11 @@ export class Batch { return this; } + transfer(from: string, to: string): Batch { + this.script.add(new Transfer(from, to)); + return this; + } + uploadFile(src: string, dst: string): Batch { this.script.add(new UploadFile(this.storageProvider, src, dst)); return this; diff --git a/src/task/work.spec.ts b/src/task/work.spec.ts index f1e3c9814..1c3ad2656 100644 --- a/src/task/work.spec.ts +++ b/src/task/work.spec.ts @@ -1,7 +1,7 @@ import { Batch, WorkContext } from "./index"; import { LoggerMock, YagnaMock } from "../../tests/mock"; import { ActivityStateEnum, ResultState } from "../activity"; -import { DownloadData, DownloadFile, Run, Script, UploadData, UploadFile } from "../script"; +import { DownloadData, DownloadFile, Run, Script, Transfer, UploadData, UploadFile } from "../script"; import { ActivityMock } from "../../tests/mock/activity.mock"; /* eslint-disable @typescript-eslint/no-explicit-any */ @@ -46,6 +46,19 @@ describe("Work Context", () => { }); }); + describe("transfer()", () => { + it("should execute transfer command", async () => { + const result = ActivityMock.createResult({ stdout: "Ok" }); + runSpy.mockImplementation((cmd) => { + expect(cmd).toBeInstanceOf(Transfer); + expect(cmd["from"]).toBe("http://golem.network/test.txt"); + expect(cmd["to"]).toBe("/golem/work/test.txt"); + return Promise.resolve(result); + }); + expect(await context.transfer("http://golem.network/test.txt", "/golem/work/test.txt")).toBe(result); + }); + }); + describe("uploadFile()", () => { it("should execute upload file command", async () => { const result = ActivityMock.createResult(); @@ -190,6 +203,19 @@ describe("Work Context", () => { }); }); + describe("getIp()", () => { + it("should throw error if there is no network node", () => { + expect(context["networkNode"]).toBeUndefined(); + }); + + it("should return ip address of provider vpn network node", () => { + (context as any)["networkNode"] = { + ip: "192.168.0.2", + }; + expect(context.getIp()).toEqual("192.168.0.2"); + }); + }); + describe("beginBatch()", () => { it("should create a batch object", () => { const o = {}; diff --git a/src/task/work.ts b/src/task/work.ts index b0860ce09..d636c0f37 100644 --- a/src/task/work.ts +++ b/src/task/work.ts @@ -8,6 +8,7 @@ import { Run, Script, Start, + Transfer, UploadData, UploadFile, } from "../script"; @@ -134,6 +135,17 @@ export class WorkContext { return this.runOneCommand(run, runOptions); } + /** + * Generic transfer command, requires the user to provide a publicly readable transfer source + * + * @param from - publicly available resource for reading. Supported protocols: file, http, ftp or gftp + * @param to - file path + * @param options Additional run options. + */ + async transfer(from: string, to: string, options?: CommandOptions): Promise { + return this.runOneCommand(new Transfer(from, to), options); + } + async uploadFile(src: string, dst: string, options?: CommandOptions): Promise { return this.runOneCommand(new UploadFile(this.storageProvider, src, dst), options); } @@ -185,7 +197,12 @@ export class WorkContext { getWebsocketUri(port: number): string { if (!this.networkNode) throw new Error("There is no network in this work context"); - return this.networkNode?.getWebsocketUri(port); + return this.networkNode.getWebsocketUri(port); + } + + getIp(): string { + if (!this.networkNode) throw new Error("There is no network in this work context"); + return this.networkNode.ip.toString(); } async getState(): Promise { diff --git a/tests/e2e/tasks.spec.ts b/tests/e2e/tasks.spec.ts index c2ee777a8..0d070e86c 100644 --- a/tests/e2e/tasks.spec.ts +++ b/tests/e2e/tasks.spec.ts @@ -1,6 +1,7 @@ import { LoggerMock } from "../mock"; import { readFileSync } from "fs"; import { TaskExecutor } from "../../src"; +import fs from "fs"; const logger = new LoggerMock(false); describe("Task Executor", function () { @@ -153,4 +154,30 @@ describe("Task Executor", function () { expect(result).toEqual("Ok"); expect(readFileSync(`${process.env.GOTH_GFTP_VOLUME || ""}new_test.json`, "utf-8")).toEqual('{"test":"1234"}'); }); + + it("should run transfer file via http", async () => { + executor = await TaskExecutor.create({ + package: "golem/alpine:latest", + logger, + }); + const result = await executor.run(async (ctx) => { + const res = await ctx.transfer( + "http://registry.golem.network/download/a2bb9119476179fac36149723c3ad4474d8d135e8d2d2308eb79907a6fc74dfa", + "/golem/work/alpine.gvmi", + ); + return res.result; + }); + expect(result).toEqual("Ok"); + }); + + it("should get ip address", async () => { + executor = await TaskExecutor.create({ + package: "golem/alpine:latest", + capabilities: ["vpn"], + networkIp: "192.168.0.0/24", + logger, + }); + const result = await executor.run(async (ctx) => ctx.getIp()); + expect(["192.168.0.2", "192.168.0.3"]).toContain(result); + }); }); diff --git a/tests/mock/fixtures/test.txt b/tests/mock/fixtures/test.txt new file mode 100644 index 000000000..5cd710173 --- /dev/null +++ b/tests/mock/fixtures/test.txt @@ -0,0 +1 @@ +Hello Golem \ No newline at end of file From 72f31eb00095c8a030835c5d00c8332cbfd434ee Mon Sep 17 00:00:00 2001 From: Marcin Gordel Date: Wed, 27 Sep 2023 13:32:07 +0200 Subject: [PATCH 04/13] refactor(tests): deleted unused fixture --- tests/mock/fixtures/test.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 tests/mock/fixtures/test.txt diff --git a/tests/mock/fixtures/test.txt b/tests/mock/fixtures/test.txt deleted file mode 100644 index 5cd710173..000000000 --- a/tests/mock/fixtures/test.txt +++ /dev/null @@ -1 +0,0 @@ -Hello Golem \ No newline at end of file From 81d0c633267f5fc3252ee5fdfcf3042272ed06a2 Mon Sep 17 00:00:00 2001 From: Marcin Gordel Date: Fri, 29 Sep 2023 10:59:33 +0200 Subject: [PATCH 05/13] test(examples): fixed linter and enabled whitelist test in goth --- .../examples/selecting-providers/whitelist.mjs | 6 +++--- tests/examples/examples.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/docs-examples/examples/selecting-providers/whitelist.mjs b/examples/docs-examples/examples/selecting-providers/whitelist.mjs index e25dd6e1e..26bdcd6fe 100644 --- a/examples/docs-examples/examples/selecting-providers/whitelist.mjs +++ b/examples/docs-examples/examples/selecting-providers/whitelist.mjs @@ -7,11 +7,11 @@ import { TaskExecutor, ProposalFilters } from "@golem-sdk/golem-js"; const whiteListIds = [ "0x3a21c608925ddbc745afab6375d1f5e77283538e", - "0xd79f83f1108d1fcbe0cf57e13b452305eb38a325", + "0xd79f83f1108d1fcbe0cf57e13b452305eb38a325", "0x677c5476f3b0e1f03d5c3abd2e2e2231e36fddde", "0x06c03165aaa676680b9d02c1f3ee846c3806fec7", - "0x17ec8597ff92c3f44523bdc65bf0f1be632917ff", // goth provider-1: - "0x63fc2ad3d021a4d7e64323529a55a9442c444da0" // goth provider-2: + "0x17ec8597ff92c3f44523bdc65bf0f1be632917ff", // goth provider-1: + "0x63fc2ad3d021a4d7e64323529a55a9442c444da0", // goth provider-2: ]; console.log("Will accept only proposals from:"); for (let i = 0; i < whiteListIds.length; i++) { diff --git a/tests/examples/examples.json b/tests/examples/examples.json index 3e6bb188c..b7427852e 100644 --- a/tests/examples/examples.json +++ b/tests/examples/examples.json @@ -15,7 +15,7 @@ { "cmd": "node", "path": "examples/docs-examples/examples/selecting-providers/custom-price.mjs", "noGoth": true }, { "cmd": "node", "path": "examples/docs-examples/examples/selecting-providers/demand.mjs" }, - { "cmd": "node", "path": "examples/docs-examples/examples/selecting-providers/whitelist.mjs", "noGoth": true }, + { "cmd": "node", "path": "examples/docs-examples/examples/selecting-providers/whitelist.mjs" }, { "cmd": "node", "path": "examples/docs-examples/examples/sending-data/downloading-file.mjs" }, { "cmd": "node", "path": "examples/docs-examples/examples/sending-data/uploading-file.mjs" }, From af3fe14bfec3fd0f5a0a6c67ea3cfb97ebc447c6 Mon Sep 17 00:00:00 2001 From: Marcin Gordel Date: Fri, 29 Sep 2023 11:42:56 +0200 Subject: [PATCH 06/13] test(examples): fixed python in runners --- .github/workflows/cypress-nightly.yml | 1 + .github/workflows/examples-nightly.yml | 1 + .github/workflows/goth-nightly.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/cypress-nightly.yml b/.github/workflows/cypress-nightly.yml index f54eacc87..495a806b5 100644 --- a/.github/workflows/cypress-nightly.yml +++ b/.github/workflows/cypress-nightly.yml @@ -34,6 +34,7 @@ jobs: npm run build - name: Configure python + continue-on-error: true uses: actions/setup-python@v4 with: python-version: "3.10" diff --git a/.github/workflows/examples-nightly.yml b/.github/workflows/examples-nightly.yml index 9a2458887..ecf3ca45b 100644 --- a/.github/workflows/examples-nightly.yml +++ b/.github/workflows/examples-nightly.yml @@ -46,6 +46,7 @@ jobs: npm install ts-node - name: Configure python + continue-on-error: true uses: actions/setup-python@v4 with: python-version: "3.10" diff --git a/.github/workflows/goth-nightly.yml b/.github/workflows/goth-nightly.yml index 622ca67aa..b0dc2390e 100644 --- a/.github/workflows/goth-nightly.yml +++ b/.github/workflows/goth-nightly.yml @@ -44,6 +44,7 @@ jobs: npm run build - name: Configure python + continue-on-error: true uses: actions/setup-python@v4 with: python-version: "3.10" From 0f2b24c84b7f9019a104823c7b5f896d20b221dd Mon Sep 17 00:00:00 2001 From: Marcin Gordel Date: Fri, 29 Sep 2023 11:44:18 +0200 Subject: [PATCH 07/13] test(examples): fixed python in runners --- .github/workflows/cypress-nightly.yml | 2 +- .github/workflows/examples-nightly.yml | 2 +- .github/workflows/goth-nightly.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cypress-nightly.yml b/.github/workflows/cypress-nightly.yml index 495a806b5..c2ed3acee 100644 --- a/.github/workflows/cypress-nightly.yml +++ b/.github/workflows/cypress-nightly.yml @@ -10,7 +10,7 @@ on: jobs: cypress-tests: - runs-on: goth2 + runs-on: [goth2, ubuntu-22.10] steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/examples-nightly.yml b/.github/workflows/examples-nightly.yml index ecf3ca45b..4833088ca 100644 --- a/.github/workflows/examples-nightly.yml +++ b/.github/workflows/examples-nightly.yml @@ -21,7 +21,7 @@ jobs: run: echo "::set-output name=matrix::{\"include\":[{\"branch\":\"master\"}]}" goth-tests: - runs-on: goth2 + runs-on: [goth2, ubuntu-22.10] needs: prepare-matrix-master-only strategy: matrix: ${{ fromJson(needs.prepare-matrix-master-only.outputs.matrix-json) }} diff --git a/.github/workflows/goth-nightly.yml b/.github/workflows/goth-nightly.yml index b0dc2390e..1106a7b26 100644 --- a/.github/workflows/goth-nightly.yml +++ b/.github/workflows/goth-nightly.yml @@ -21,7 +21,7 @@ jobs: run: echo "::set-output name=matrix::{\"include\":[{\"branch\":\"master\"}]}" goth-tests: - runs-on: goth2 + runs-on: [goth2, ubuntu-22.10] needs: prepare-matrix-master-only strategy: matrix: ${{ fromJson(needs.prepare-matrix-master-only.outputs.matrix-json) }} From b7af44eaa439f15b5885c5e624c14394c2e89dc5 Mon Sep 17 00:00:00 2001 From: Marcin Gordel Date: Fri, 29 Sep 2023 12:31:10 +0200 Subject: [PATCH 08/13] test(examples): increased timeout --- tests/examples/examples.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/examples/examples.test.ts b/tests/examples/examples.test.ts index 85ce0ea47..e61e534b2 100644 --- a/tests/examples/examples.test.ts +++ b/tests/examples/examples.test.ts @@ -21,7 +21,7 @@ type Example = { skip?: boolean; }; -async function test(cmd: string, path: string, args: string[] = [], timeout = 120) { +async function test(cmd: string, path: string, args: string[] = [], timeout = 180) { const file = basename(path); const cwd = dirname(path); const spawnedExample = spawn(cmd, [file, ...args], { cwd }); From 777b82dd1c802a6863775315e1cd5ada189fa827 Mon Sep 17 00:00:00 2001 From: Marcin Gordel Date: Fri, 29 Sep 2023 13:03:30 +0200 Subject: [PATCH 09/13] test(examples): fixed unit test --- src/task/work.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/task/work.spec.ts b/src/task/work.spec.ts index 1c3ad2656..362d07de3 100644 --- a/src/task/work.spec.ts +++ b/src/task/work.spec.ts @@ -190,7 +190,7 @@ describe("Work Context", () => { describe("getWebsocketUri()", () => { it("should throw error if there is no network node", () => { - expect(context["networkNode"]).toBeUndefined(); + expect(() => context.getIp()).toThrow(new Error("There is no network in this work context")); }); it("should return websocket URI", () => { @@ -205,7 +205,7 @@ describe("Work Context", () => { describe("getIp()", () => { it("should throw error if there is no network node", () => { - expect(context["networkNode"]).toBeUndefined(); + expect(() => context.getIp()).toThrow(new Error("There is no network in this work context")); }); it("should return ip address of provider vpn network node", () => { From 1dec323b4168a9623acc16c93065da8ddb001846 Mon Sep 17 00:00:00 2001 From: Marcin Gordel Date: Fri, 29 Sep 2023 13:14:33 +0200 Subject: [PATCH 10/13] test(examples): fixed goth --- .github/workflows/examples-nightly.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/examples-nightly.yml b/.github/workflows/examples-nightly.yml index 4833088ca..8f978b809 100644 --- a/.github/workflows/examples-nightly.yml +++ b/.github/workflows/examples-nightly.yml @@ -57,7 +57,6 @@ jobs: rm -rf ../goth/assets python -m goth create-assets ../goth/assets sed -Ezi 's/(use\-proxy:\s)(True)/\1False/mg' ../goth/assets/goth-config.yml - sed -Ezi 's/(use\-prerelease:\s)(false)/\1true\n release-tag: "0.13.0-rc21"/mg' ../goth/assets/goth-config.yml sed -i '/^ENTRYPOINT/i ENV YAGNA_AUTOCONF_APPKEY=try_golem' ../goth/assets/docker/yagna-goth-deb.Dockerfile - name: Cleanup Docker From ace4906cf4a98b1f95f55a520a6c9a0f23d0508e Mon Sep 17 00:00:00 2001 From: Marcin Gordel Date: Sat, 30 Sep 2023 14:24:12 +0200 Subject: [PATCH 11/13] test(examples): skip test for goth with batch and transfer JST-363: Bug in goth for parsing batch command in gftp wrapper --- tests/examples/examples.json | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/tests/examples/examples.json b/tests/examples/examples.json index b7427852e..688cc6718 100644 --- a/tests/examples/examples.json +++ b/tests/examples/examples.json @@ -1,7 +1,15 @@ [ - { "cmd": "node", "path": "examples/docs-examples/examples/composing-tasks/batch-end.mjs" }, - { "cmd": "node", "path": "examples/docs-examples/examples/composing-tasks/batch-endstream-chunks.mjs" }, - { "cmd": "node", "path": "examples/docs-examples/examples/composing-tasks/batch-endstream-forawait.mjs" }, + { "cmd": "node", "path": "examples/docs-examples/examples/composing-tasks/batch-end.mjs", "noGoth": true }, + { + "cmd": "node", + "path": "examples/docs-examples/examples/composing-tasks/batch-endstream-chunks.mjs", + "noGoth": true + }, + { + "cmd": "node", + "path": "examples/docs-examples/examples/composing-tasks/batch-endstream-forawait.mjs", + "noGoth": true + }, { "cmd": "node", "path": "examples/docs-examples/examples/composing-tasks/multiple-run-prosaic.mjs" }, { "cmd": "node", "path": "examples/docs-examples/examples/composing-tasks/single-command.mjs" }, { "cmd": "node", "path": "examples/docs-examples/examples/composing-tasks/single-command.cjs" }, @@ -33,7 +41,11 @@ { "cmd": "node", "path": "examples/docs-examples/examples/working-with-images/tag.mjs" }, { "cmd": "node", "path": "examples/docs-examples/examples/working-with-results/multi-command-end.mjs" }, - { "cmd": "node", "path": "examples/docs-examples/examples/working-with-results/multi-command-endstream.mjs" }, + { + "cmd": "node", + "path": "examples/docs-examples/examples/working-with-results/multi-command-endstream.mjs", + "noGoth": true + }, { "cmd": "node", "path": "examples/docs-examples/examples/working-with-results/multi-command-fail.mjs", From d43061ee957ea83e378da9a18a7fc4f44cbc3b94 Mon Sep 17 00:00:00 2001 From: Marcin Gordel Date: Sat, 30 Sep 2023 15:44:02 +0200 Subject: [PATCH 12/13] test(examples): fixed CI --- .github/workflows/examples-nightly.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/examples-nightly.yml b/.github/workflows/examples-nightly.yml index 8f978b809..ecf3ca45b 100644 --- a/.github/workflows/examples-nightly.yml +++ b/.github/workflows/examples-nightly.yml @@ -21,7 +21,7 @@ jobs: run: echo "::set-output name=matrix::{\"include\":[{\"branch\":\"master\"}]}" goth-tests: - runs-on: [goth2, ubuntu-22.10] + runs-on: goth2 needs: prepare-matrix-master-only strategy: matrix: ${{ fromJson(needs.prepare-matrix-master-only.outputs.matrix-json) }} @@ -57,6 +57,7 @@ jobs: rm -rf ../goth/assets python -m goth create-assets ../goth/assets sed -Ezi 's/(use\-proxy:\s)(True)/\1False/mg' ../goth/assets/goth-config.yml + sed -Ezi 's/(use\-prerelease:\s)(false)/\1true\n release-tag: "0.13.0-rc21"/mg' ../goth/assets/goth-config.yml sed -i '/^ENTRYPOINT/i ENV YAGNA_AUTOCONF_APPKEY=try_golem' ../goth/assets/docker/yagna-goth-deb.Dockerfile - name: Cleanup Docker From 1a1682590aebee1bbd5020a88e3538085de3d694 Mon Sep 17 00:00:00 2001 From: Marcin Gordel Date: Sat, 30 Sep 2023 15:51:11 +0200 Subject: [PATCH 13/13] test(examples): fixed CI --- .github/workflows/examples-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/examples-nightly.yml b/.github/workflows/examples-nightly.yml index ecf3ca45b..4833088ca 100644 --- a/.github/workflows/examples-nightly.yml +++ b/.github/workflows/examples-nightly.yml @@ -21,7 +21,7 @@ jobs: run: echo "::set-output name=matrix::{\"include\":[{\"branch\":\"master\"}]}" goth-tests: - runs-on: goth2 + runs-on: [goth2, ubuntu-22.10] needs: prepare-matrix-master-only strategy: matrix: ${{ fromJson(needs.prepare-matrix-master-only.outputs.matrix-json) }}