From e40bbac33fc41601630aaf26a74650e2effdf6db Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Thu, 24 Nov 2022 20:45:04 +0200 Subject: [PATCH 1/5] Use npm actions in e2e --- .github/workflows/snapshot.yml | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index f6dbe3291..694c888f0 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -51,13 +51,21 @@ jobs: - name: Set avm version if: inputs.avm-version != '' - working-directory: packages/fluence-js - run: pnpm i --save -E @fluencelabs/avm@${{ inputs.avm-version }} + uses: fluencelabs/github-actions/npm-set-dependency@FLU-124 + with: + package: "@fluencelabs/avm" + version: ${{ inputs.avm-version }} + working-directory: packages/fluence-js + package-manager: pnpm - name: Set marine-js version if: inputs.marine-js-version != '' - working-directory: packages/fluence-js - run: pnpm i --save -E @fluencelabs/marine-js@${{ inputs.marine-js-version }} + uses: fluencelabs/github-actions/npm-set-dependency@FLU-124 + with: + package: "@fluencelabs/marine-js" + version: ${{ inputs.marine-js-version }} + working-directory: packages/fluence-js + package-manager: pnpm - name: Import secrets uses: hashicorp/vault-action@v2.4.3 @@ -77,21 +85,15 @@ jobs: uses: fluencelabs/github-actions/generate-snapshot-id@main - name: Set package version - id: snapshot - run: | - node ci.js bump-version ${{ steps.version.outputs.id }} - echo "version=$(node ci.js get-version)" >> $GITHUB_OUTPUT + run: node ci.js bump-version ${{ steps.version.outputs.id }} - run: pnpm -r build - - name: Publish to self-hosted npm repo - run: | - # Publish to self-hosted npm repo - pnpm --no-git-checks --registry https://npm.fluence.dev -r publish --tag snapshot -filter '@fluencelabs/*' - - - name: Print info to check summary - uses: fluencelabs/github-actions/npm-publish-snapshot@main + - name: Publish snapshots + id: snapshot + uses: fluencelabs/github-actions/npm-publish-snapshot@FLU-124 with: working-directory: packages/fluence-js id: ${{ steps.version.outputs.id }} - publish: false + package-manager: pnpm + flags: "-r --registry https://npm.fluence.dev --no-git-checks --tag snapsot -filter '@fluencelabs/*" From 8900a89e619b4f9d4af8acabf8163a266c980b06 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Thu, 24 Nov 2022 20:46:52 +0200 Subject: [PATCH 2/5] Update test workflow --- .github/workflows/tests.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e3ec825cc..37295468b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -85,13 +85,21 @@ jobs: - name: Set avm version if: inputs.avm-version != '' - working-directory: packages/fluence-js - run: pnpm i --save -E @fluencelabs/avm@${{ inputs.avm-version }} + uses: fluencelabs/github-actions/npm-set-dependency@FLU-124 + with: + package: "@fluencelabs/avm" + version: ${{ inputs.avm-version }} + working-directory: packages/fluence-js + package-manager: pnpm - name: Set marine-js version if: inputs.marine-js-version != '' - working-directory: packages/fluence-js - run: pnpm i --save -E @fluencelabs/marine-js@${{ inputs.marine-js-version }} + uses: fluencelabs/github-actions/npm-set-dependency@FLU-124 + with: + package: "@fluencelabs/marine-js" + version: ${{ inputs.marine-js-version }} + working-directory: packages/fluence-js + package-manager: pnpm - run: pnpm -r build - run: pnpm -r test From 45ac80fab3d4be14c8b06d748e81ccb50985db19 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Thu, 24 Nov 2022 20:51:34 +0200 Subject: [PATCH 3/5] Typo --- .github/workflows/snapshot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 694c888f0..c16e9e9e8 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -96,4 +96,4 @@ jobs: working-directory: packages/fluence-js id: ${{ steps.version.outputs.id }} package-manager: pnpm - flags: "-r --registry https://npm.fluence.dev --no-git-checks --tag snapsot -filter '@fluencelabs/*" + flags: "-r --registry https://npm.fluence.dev --no-git-checks --tag snapsot -filter '@fluencelabs/*'" From 532ec3e79ee121fe998a5ebfd0c56190ee081add Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Thu, 24 Nov 2022 21:04:02 +0200 Subject: [PATCH 4/5] Prepend verions with v --- .github/workflows/snapshot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index c16e9e9e8..108f2b90e 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest outputs: - fluence-js-version: "${{ steps.snapshot.outputs.version }}" + fluence-js-version: "v${{ steps.snapshot.outputs.version }}" permissions: contents: read From d043b308ef9b787f62f62b2ec0b8dbbbf47642a1 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Thu, 24 Nov 2022 21:17:33 +0200 Subject: [PATCH 5/5] Use main branch --- .github/workflows/snapshot.yml | 6 +++--- .github/workflows/tests.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 108f2b90e..648a6c3f7 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -51,7 +51,7 @@ jobs: - name: Set avm version if: inputs.avm-version != '' - uses: fluencelabs/github-actions/npm-set-dependency@FLU-124 + uses: fluencelabs/github-actions/npm-set-dependency@main with: package: "@fluencelabs/avm" version: ${{ inputs.avm-version }} @@ -60,7 +60,7 @@ jobs: - name: Set marine-js version if: inputs.marine-js-version != '' - uses: fluencelabs/github-actions/npm-set-dependency@FLU-124 + uses: fluencelabs/github-actions/npm-set-dependency@main with: package: "@fluencelabs/marine-js" version: ${{ inputs.marine-js-version }} @@ -91,7 +91,7 @@ jobs: - name: Publish snapshots id: snapshot - uses: fluencelabs/github-actions/npm-publish-snapshot@FLU-124 + uses: fluencelabs/github-actions/npm-publish-snapshot@main with: working-directory: packages/fluence-js id: ${{ steps.version.outputs.id }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 37295468b..cf2514ccb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -85,7 +85,7 @@ jobs: - name: Set avm version if: inputs.avm-version != '' - uses: fluencelabs/github-actions/npm-set-dependency@FLU-124 + uses: fluencelabs/github-actions/npm-set-dependency@main with: package: "@fluencelabs/avm" version: ${{ inputs.avm-version }} @@ -94,7 +94,7 @@ jobs: - name: Set marine-js version if: inputs.marine-js-version != '' - uses: fluencelabs/github-actions/npm-set-dependency@FLU-124 + uses: fluencelabs/github-actions/npm-set-dependency@main with: package: "@fluencelabs/marine-js" version: ${{ inputs.marine-js-version }}