Skip to content

Commit

Permalink
Merge pull request #1012 from golemfactory/prepare-for-release
Browse files Browse the repository at this point in the history
Bump min supported yagna to 0.15.2 and add missing log line
  • Loading branch information
mgordel authored Jul 1, 2024
2 parents 738df83 + 370e6c6 commit 013be2d
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ on:
provider_version:
description: "Provider version (e.g., v0.15.0 or pre-rel-v0.15.1)"
required: false
default: "v0.15.0"
default: "v0.15.2"
requestor_version:
description: "Requestor version (e.g., v0.15.0 or pre-rel-v0.15.1)"
required: false
default: "v0.15.0"
default: "v0.15.2"
provider_wasi_version:
description: "Provider WASI version (e.g., v0.2.2)"
required: false
Expand All @@ -40,8 +40,8 @@ permissions:
contents: read # for checkout

env:
PROVIDER_VERSION: ${{ github.event.inputs.provider_version || 'v0.15.0' }}
REQUESTOR_VERSION: ${{ github.event.inputs.requestor_version || 'v0.15.0' }}
PROVIDER_VERSION: ${{ github.event.inputs.provider_version || 'v0.15.2' }}
REQUESTOR_VERSION: ${{ github.event.inputs.requestor_version || 'v0.15.2' }}
PROVIDER_WASI_VERSION: ${{ github.event.inputs.provider_wasi_version || 'v0.2.2' }}
PROVIDER_VM_VERSION: ${{ github.event.inputs.provider_vm_version || 'v0.3.0' }}
PAYMENT_NETWORK: ${{ github.event.inputs.payment_network || 'holesky' }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ yarn add @golem-sdk/golem-js
## Supported environments

The SDK is designed to work with LTS versions of Node (starting from 18)
and with browsers.
and with browsers. The minimum supported `yagna` version is `0.15.2`.

## Getting started with Golem Network

Expand Down
1 change: 1 addition & 0 deletions src/market/market.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@ export class MarketModuleImpl implements MarketModule {
agreementOptions?: AgreementOptions,
signalOrTimeout?: number | AbortSignal,
): Promise<Agreement> {
this.logger.info("Trying to sign an agreement ...");
const signal = createAbortSignalFromTimeout(signalOrTimeout);

const getProposal = async () => {
Expand Down
8 changes: 4 additions & 4 deletions src/shared/yagna/yagna.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const mockIdentityModel = imock<IdentityApi.IdentityDTO>();
describe("Yagna Utils", () => {
describe("Yagna version support checking", () => {
describe("Positive cases - given min supported version is 0.15.0", () => {
it.each(["0.15.0", "0.15.2", "0.15.3-rc5", "pre-rel-v0.15.3-rc5"])(
it.each(["0.15.2", "0.15.3-rc5", "pre-rel-v0.15.3-rc5"])(
"should not throw when connect is called and the yagna version is %s",
async (version) => {
const mockVersionResponse = {
Expand Down Expand Up @@ -42,8 +42,8 @@ describe("Yagna Utils", () => {
it("should throw when connect is called and yagna version is too low", async () => {
const mockVersionResponse = {
current: {
version: "0.12.0",
name: "v0.12.0",
version: "0.15.0",
name: "v0.15.0",
seen: false,
releaseTs: "2023-12-07T14:23:48",
insertionTs: "2023-12-07T18:22:45",
Expand All @@ -59,7 +59,7 @@ describe("Yagna Utils", () => {

await expect(() => y.connect()).rejects.toMatchError(
new GolemPlatformError(
`You run yagna in version 0.12.0 and the minimal version supported by the SDK is ${MIN_SUPPORTED_YAGNA}. Please consult the golem-js README to find matching SDK version or upgrade your yagna installation.`,
`You run yagna in version 0.15.0 and the minimal version supported by the SDK is ${MIN_SUPPORTED_YAGNA}. Please consult the golem-js README to find matching SDK version or upgrade your yagna installation.`,
),
);
});
Expand Down
2 changes: 1 addition & 1 deletion src/shared/yagna/yagnaApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export type YagnaOptions = {
logger?: Logger;
};

export const MIN_SUPPORTED_YAGNA = "0.15.0";
export const MIN_SUPPORTED_YAGNA = "0.15.2";

// Workarounds for an issue with missing support for discriminators
// {@link https://github.com/ferdikoomen/openapi-typescript-codegen/issues/985}
Expand Down
2 changes: 1 addition & 1 deletion tests/docker/Provider.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG UBUNTU_VERSION=22.04
ARG YA_CORE_PROVIDER_VERSION=v0.15.0
ARG YA_CORE_PROVIDER_VERSION=v0.15.2
ARG YA_WASI_VERSION=v0.2.2
ARG YA_VM_VERSION=v0.3.0

Expand Down
2 changes: 1 addition & 1 deletion tests/docker/Requestor.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG UBUNTU_VERSION=22.04
ARG YA_CORE_REQUESTOR_VERSION=v0.15.0
ARG YA_CORE_REQUESTOR_VERSION=v0.15.2

FROM node:18.18.2
ARG YA_CORE_REQUESTOR_VERSION
Expand Down

0 comments on commit 013be2d

Please sign in to comment.