From addcaa9a0e7085e74a7f9cc60edd64d75cb1c112 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Sat, 3 Sep 2022 13:41:10 +0300 Subject: [PATCH 01/16] Add workflow_call --- .github/workflows/run_tests.yml | 80 ++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 21 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index e9a1916de..297111575 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -2,38 +2,82 @@ name: Run tests on: push: + paths-ignode: + - "**.md" + + workflow_call: + inputs: + image: + description: "rust-peer image tag" + type: string + required: true + +concurrency: + group: "${{ github.workflow }}-${{ github.ref }}" + cancel-in-progress: true + +env: + FORCE_COLOR: true + CI: true jobs: - build: + fluence-js: + name: "Run fluence-js tests" runs-on: ubuntu-latest + permissions: + contents: read + id-token: write + strategy: matrix: - node-version: [16.x, 17.x] + node-version: + - 16.x + - 17.x env: RUST_PEER_IMAGE: fluencelabs/fluence steps: - - uses: actions/checkout@v3 + - name: Set rust-peer image + id: image + run: | + if [[ ${{ github.event_name }} == workflow_call ]]; then + echo "::set-output name=image::${{ inputs.image }}" + else + echo "::set-output name=image::fluencelabs/fluence:minimal" + fi - - uses: pnpm/action-setup@v2.2.2 + - name: Login to DockerHub + uses: docker/login-action@v2 with: - version: 7 + registry: docker.fluence.dev + username: ${{ env.DOCKER_USERNAME }} + password: ${{ env.DOCKER_PASSWORD }} - - name: Setup Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - cache: 'pnpm' + - name: Checkout + uses: actions/checkout@v3 - name: Setup docker-compose uses: KengoTODA/actions-setup-docker-compose@v1.0.9 with: version: 'v2.10.0' - - name: Pull image - run: docker pull ${RUST_PEER_IMAGE} + - name: Pull rust-peer image + env: + RUST_PEER_IMAGE: ${{ steps.image.outputs.image }} + run: docker pull $RUST_PEER_IMAGE + + - name: Setup pnpm + uses: pnpm/action-setup@v2.2.2 + with: + version: 7 + + - name: Setup Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + cache: 'pnpm' - name: Run rust-peer uses: isbang/compose-action@v1.1.0 @@ -41,12 +85,6 @@ jobs: compose-file: ".github/e2e/docker-compose.yml" down-flags: "--volumes" - - name: Install deps - run: pnpm i - - - name: Run tests - run: | - pnpm -r build - pnpm -r test - env: - CI: true + - run: pnpm i + - run: pnpm -r build + - run: pnpm -r test From 689885643744a5a4f55f737bd50d1b726f8d2ae7 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Sat, 3 Sep 2022 13:43:06 +0300 Subject: [PATCH 02/16] Add missing import secrest --- .github/workflows/run_tests.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 297111575..7bcf74e51 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -48,6 +48,19 @@ jobs: echo "::set-output name=image::fluencelabs/fluence:minimal" fi + - name: Import secrets + uses: hashicorp/vault-action@v2.4.1 + with: + url: https://vault.fluence.dev + path: jwt/github + role: ci + method: jwt + jwtGithubAudience: "https://github.com/fluencelabs" + jwtTtl: 300 + secrets: | + kv/docker-registry/basicauth/ci username | DOCKER_USERNAME ; + kv/docker-registry/basicauth/ci password | DOCKER_PASSWORD + - name: Login to DockerHub uses: docker/login-action@v2 with: From 1eef4ad2689ba5fe5f88a5fcc837af587fe42b1a Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 6 Sep 2022 14:36:54 +0300 Subject: [PATCH 03/16] Run e2e with aqua-playground (#179) * Try to run e2e with aqua-playground * Fixes --- .github/workflows/fluence_js_e2e.yml | 90 ++++++++++++++++++++++++++++ .github/workflows/publish_branch.yml | 1 - 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/fluence_js_e2e.yml diff --git a/.github/workflows/fluence_js_e2e.yml b/.github/workflows/fluence_js_e2e.yml new file mode 100644 index 000000000..2ec1ba722 --- /dev/null +++ b/.github/workflows/fluence_js_e2e.yml @@ -0,0 +1,90 @@ +name: Run e2e tests + +on: + pull_request: + paths-ignore: + - "**.md" + +concurrency: + group: "${{ github.workflow }}-${{ github.ref }}" + cancel-in-progress: true + +env: + FORCE_COLOR: true + +jobs: + build: + name: "Build fluence-js" + runs-on: ubuntu-latest + + permissions: + contents: read + id-token: write + + outputs: + fluence-js-version: "${{ steps.build.outputs.version }}" + + steps: + - uses: actions/checkout@v3 + + - uses: pnpm/action-setup@v2.2.2 + with: + version: 7 + + - name: Setup node with self-hosted npm registry + uses: actions/setup-node@v2 + with: + node-version: "16" + registry-url: "https://npm.fluence.dev" + + - run: pnpm i + - run: pnpm -r build + + - name: Import secrets + uses: hashicorp/vault-action@v2.4.2 + with: + url: https://vault.fluence.dev + path: jwt/github + role: ci + method: jwt + jwtGithubAudience: "https://github.com/fluencelabs" + jwtTtl: 300 + exportToken: false + secrets: | + kv/npm-registry/basicauth/ci token | NODE_AUTH_TOKEN + + - name: Generate package version + id: version + run: | + BRANCH=${GITHUB_REF#refs/heads/} + SHA=$(git rev-parse --short HEAD) + + echo "::set-output name=sha::$SHA" + echo "::set-output name=branch::${BRANCH//[^a-zA-Z0-9-]/-}" + + - name: Set package version + id: build + env: + BRANCH: ${{ steps.version.outputs.branch }} + SHA: ${{ steps.version.outputs.sha }} + RUN: ${{ github.run_number }} + ATTEMPT: ${{ github.run_attempt }} + run: | + node ci.js bump-version ${{ env.BRANCH }}-${{ env.SHA }}-${{ env.RUN }}-${{ env.ATTEMPT }} + echo "::set-output name=version::$(node ci.js get-version)" + + - name: Publish to self-hosted npm repo + run: pnpm --no-git-checks --registry https://npm.fluence.dev -r publish --tag e2e -filter '@fluencelabs/*' + + aqua-playground: + permissions: + contents: read + id-token: write + + needs: + - build + + uses: fluencelabs/aqua-playground/.github/workflows/tests.yml@marine-e2e + with: + fluence-js-version: ${{ needs.build.outputs.fluence-js-version }} + ref: marine-e2e diff --git a/.github/workflows/publish_branch.yml b/.github/workflows/publish_branch.yml index d970f41f5..5361d266b 100644 --- a/.github/workflows/publish_branch.yml +++ b/.github/workflows/publish_branch.yml @@ -70,4 +70,3 @@ jobs: echo "" echo "echo '@fluencelabs:registry=https://npm.fluence.dev/' > .npmrc" echo "npm i @fluencelabs/fluence@${fjs_version}" - From 73e196710fa1884f91918cfecbf8041eb31878a9 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 6 Sep 2022 15:18:53 +0300 Subject: [PATCH 04/16] Use workflow_call to run local tests and publish snapshot --- .github/workflows/publish_branch.yml | 72 ------------------- .github/workflows/run-tests.yml | 26 +++++++ .../{fluence_js_e2e.yml => snapshot.yml} | 71 +++++++++++------- .../workflows/{run_tests.yml => tests.yml} | 49 +++++-------- 4 files changed, 87 insertions(+), 131 deletions(-) delete mode 100644 .github/workflows/publish_branch.yml create mode 100644 .github/workflows/run-tests.yml rename .github/workflows/{fluence_js_e2e.yml => snapshot.yml} (54%) rename .github/workflows/{run_tests.yml => tests.yml} (73%) diff --git a/.github/workflows/publish_branch.yml b/.github/workflows/publish_branch.yml deleted file mode 100644 index 5361d266b..000000000 --- a/.github/workflows/publish_branch.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: "Publish development branch packages" - -on: - push: - -jobs: - publish-branch: - runs-on: ubuntu-latest - - permissions: - contents: read - id-token: write - - steps: - - uses: actions/checkout@v3 - - - uses: pnpm/action-setup@v2.2.2 - with: - version: 7 - - - name: "Setup node with self-hosted npm registry" - uses: actions/setup-node@v2 - with: - node-version: "16" - registry-url: "https://npm.fluence.dev" - - - name: "Build packages" - run: | - pnpm i - pnpm -r build - - - name: "Import secrets" - uses: hashicorp/vault-action@v2.4.2 - with: - url: https://vault.fluence.dev - path: jwt/github - role: ci - method: jwt - jwtGithubAudience: "https://github.com/fluencelabs" - jwtTtl: 300 - exportToken: false - secrets: | - kv/npm-registry/basicauth/ci token | NODE_AUTH_TOKEN - - - name: "Generate package version" - id: version - run: | - BRANCH=${GITHUB_REF#refs/heads/} - SHA=$(git rev-parse --short HEAD) - - echo "::set-output name=sha::$SHA" - echo "::set-output name=branch::${BRANCH//[^a-zA-Z0-9-]/-}" - - - name: "Set package version" - env: - BRANCH: ${{ steps.version.outputs.branch }} - SHA: ${{ steps.version.outputs.sha }} - RUN: ${{ github.run_number }} - ATTEMPT: ${{ github.run_attempt }} - run: node ci.js bump-version ${{ env.BRANCH }}-${{ env.SHA }}-${{ env.RUN }}-${{ env.ATTEMPT }} - - - name: "Publish to self-hosted npm repo" - run: pnpm --no-git-checks --registry https://npm.fluence.dev -r publish --tag snapshot -filter '@fluencelabs/*' - - - name: "Click to see published version" - run: | - fjs_version=$(node ci.js get-version) - echo "FluenceJS version is ${fjs_version}" - echo "To install it run the following: " - echo "" - echo "echo '@fluencelabs:registry=https://npm.fluence.dev/' > .npmrc" - echo "npm i @fluencelabs/fluence@${fjs_version}" diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml new file mode 100644 index 000000000..2f36c4cfb --- /dev/null +++ b/.github/workflows/run-tests.yml @@ -0,0 +1,26 @@ +name: Run tests + +on: + pull-request: + paths-ignode: + - "**.md" + +concurrency: + group: "${{ github.workflow }}-${{ github.ref }}" + cancel-in-progress: true + +jobs: + fluence-js: + uses: ./.github/workflows/tests.yml + with: + ref: ${{ github.ref }} + + snapshot: + needs: fluence-js + uses: ./.github/workflows/snapshot.yml + + aqua-playground: + needs: snapshot + uses: fluencelabs/aqua-playground/.github/workflows/tests.yml@marine-e2e + with: + fluence-js-version: ${{ needs.snapshot.outputs.fluence-js-version }} diff --git a/.github/workflows/fluence_js_e2e.yml b/.github/workflows/snapshot.yml similarity index 54% rename from .github/workflows/fluence_js_e2e.yml rename to .github/workflows/snapshot.yml index 2ec1ba722..7a2fc285d 100644 --- a/.github/workflows/fluence_js_e2e.yml +++ b/.github/workflows/snapshot.yml @@ -1,35 +1,31 @@ -name: Run e2e tests +name: Publish snapshot on: - pull_request: - paths-ignore: - - "**.md" - -concurrency: - group: "${{ github.workflow }}-${{ github.ref }}" - cancel-in-progress: true - -env: - FORCE_COLOR: true + workflow_call: + outputs: + fluence-js-version: + description: "FluenceJS snapshot version" + value: ${{ jobs.publish-snapshot.outputs.fluence-js-version }} jobs: - build: - name: "Build fluence-js" + publish-snapshot: + name: "Publish snapshot" runs-on: ubuntu-latest + outputs: + fluence-js-version: "${{ steps.build.outputs.version }}" + permissions: contents: read id-token: write - outputs: - fluence-js-version: "${{ steps.build.outputs.version }}" - steps: - - uses: actions/checkout@v3 + - name: Checkout fluence-js + uses: actions/checkout@v3 - uses: pnpm/action-setup@v2.2.2 with: - version: 7 + version: 7 - name: Setup node with self-hosted npm registry uses: actions/setup-node@v2 @@ -76,15 +72,36 @@ jobs: - name: Publish to self-hosted npm repo run: pnpm --no-git-checks --registry https://npm.fluence.dev -r publish --tag e2e -filter '@fluencelabs/*' - aqua-playground: - permissions: - contents: read - id-token: write + comment: + name: "Update comment" + if: github.event.pull_request != [] + runs-on: ubuntu-latest needs: - - build + - publish-snapshot + + env: + FLUENCE_JS_VERSION: ${{ needs.publish-snapshot.outputs.version }} - uses: fluencelabs/aqua-playground/.github/workflows/tests.yml@marine-e2e - with: - fluence-js-version: ${{ needs.build.outputs.fluence-js-version }} - ref: marine-e2e + steps: + - name: Find comment + uses: peter-evans/find-comment@v1 + id: comment + with: + issue-number: "${{ github.event.pull_request.number }}" + comment-author: github-actions[bot] + body-includes: "## FluenceJS version is" + + - name: Update comment + uses: peter-evans/create-or-update-comment@v1 + with: + comment-id: "${{ steps.comment.outputs.comment-id }}" + issue-number: "${{ github.event.pull_request.number }}" + edit-mode: replace + body: | + ## FluenceJS version is [${{ env.FLUENCE_JS_VERSION }}](https://npm.fluence.dev/-/web/detail/@fluencelabs/fluence/v/${{ env.FLUENCE_JS_VERSION }}) + To install it run: + ```shell + echo '@fluencelabs:registry=https://npm.fluence.dev/' > .npmrc + npm i @fluencelabs/fluence@${{ env.FLUENCE_JS_VERSION }} + ``` diff --git a/.github/workflows/run_tests.yml b/.github/workflows/tests.yml similarity index 73% rename from .github/workflows/run_tests.yml rename to .github/workflows/tests.yml index 7bcf74e51..b1282b69d 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/tests.yml @@ -1,28 +1,24 @@ -name: Run tests +name: Run tests with worflow_call on: - push: - paths-ignode: - - "**.md" - workflow_call: inputs: - image: + rust-peer-image: description: "rust-peer image tag" type: string - required: true - -concurrency: - group: "${{ github.workflow }}-${{ github.ref }}" - cancel-in-progress: true + default: "fluencelabs/fluence:minimal" + ref: + type: string + default: "master" env: + RUST_PEER_IMAGE: "${{ inputs.rust-peer-image }}" FORCE_COLOR: true CI: true jobs: fluence-js: - name: "Run fluence-js tests" + name: "Run tests" runs-on: ubuntu-latest permissions: @@ -35,19 +31,7 @@ jobs: - 16.x - 17.x - env: - RUST_PEER_IMAGE: fluencelabs/fluence - steps: - - name: Set rust-peer image - id: image - run: | - if [[ ${{ github.event_name }} == workflow_call ]]; then - echo "::set-output name=image::${{ inputs.image }}" - else - echo "::set-output name=image::fluencelabs/fluence:minimal" - fi - - name: Import secrets uses: hashicorp/vault-action@v2.4.1 with: @@ -70,6 +54,9 @@ jobs: - name: Checkout uses: actions/checkout@v3 + with: + repository: fluencelabs/fluencejs + ref: ${{ inputs.ref }} - name: Setup docker-compose uses: KengoTODA/actions-setup-docker-compose@v1.0.9 @@ -77,10 +64,14 @@ jobs: version: 'v2.10.0' - name: Pull rust-peer image - env: - RUST_PEER_IMAGE: ${{ steps.image.outputs.image }} run: docker pull $RUST_PEER_IMAGE + - name: Run rust-peer + uses: isbang/compose-action@v1.1.0 + with: + compose-file: ".github/e2e/docker-compose.yml" + down-flags: "--volumes" + - name: Setup pnpm uses: pnpm/action-setup@v2.2.2 with: @@ -92,12 +83,6 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'pnpm' - - name: Run rust-peer - uses: isbang/compose-action@v1.1.0 - with: - compose-file: ".github/e2e/docker-compose.yml" - down-flags: "--volumes" - - run: pnpm i - run: pnpm -r build - run: pnpm -r test From 7dcc641b6640629aefcdc8d15b214393ec1f25a6 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 6 Sep 2022 15:20:40 +0300 Subject: [PATCH 05/16] Typo --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2f36c4cfb..2cb4ae8c2 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -1,7 +1,7 @@ name: Run tests on: - pull-request: + pull_request: paths-ignode: - "**.md" From 944862114f102ccabab4753595e211b323b691a8 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 6 Sep 2022 15:21:32 +0300 Subject: [PATCH 06/16] 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 7a2fc285d..06ccd5e69 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -74,7 +74,7 @@ jobs: comment: name: "Update comment" - if: github.event.pull_request != [] + if: github.event.pull_request != '[]' runs-on: ubuntu-latest needs: From 22b8ca04c7c03e3f39cc98bdf0cd1b2aa1f8c192 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 6 Sep 2022 15:23:07 +0300 Subject: [PATCH 07/16] Fix --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b1282b69d..f6647d783 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -55,7 +55,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 with: - repository: fluencelabs/fluencejs + repository: fluencelabs/fluence-js ref: ${{ inputs.ref }} - name: Setup docker-compose From f208965e0f6c1a4190c6419f79067b07dec4a6ae Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 6 Sep 2022 15:23:52 +0300 Subject: [PATCH 08/16] Run e2e and tests in parallel --- .github/workflows/run-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2cb4ae8c2..b89067a34 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -16,7 +16,6 @@ jobs: ref: ${{ github.ref }} snapshot: - needs: fluence-js uses: ./.github/workflows/snapshot.yml aqua-playground: From e7284d452616fd3f0e32a827997bf3ad3c52a36f Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 6 Sep 2022 15:25:26 +0300 Subject: [PATCH 09/16] Colors! --- .github/workflows/snapshot.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 06ccd5e69..09b175241 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -7,6 +7,10 @@ on: description: "FluenceJS snapshot version" value: ${{ jobs.publish-snapshot.outputs.fluence-js-version }} +env: + FORCE_COLOR: true + CI: true + jobs: publish-snapshot: name: "Publish snapshot" From 623d3353b61bb48397387139a8cd48a61940c6de Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 6 Sep 2022 15:27:12 +0300 Subject: [PATCH 10/16] Always add comment --- .github/workflows/snapshot.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 09b175241..c39b847de 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -78,7 +78,6 @@ jobs: comment: name: "Update comment" - if: github.event.pull_request != '[]' runs-on: ubuntu-latest needs: From 0115ced50953f03fe3dc5621e95b55742c83fd31 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 6 Sep 2022 15:29:49 +0300 Subject: [PATCH 11/16] Fix comment --- .github/workflows/snapshot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index c39b847de..30277e1bf 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -105,6 +105,6 @@ jobs: ## FluenceJS version is [${{ env.FLUENCE_JS_VERSION }}](https://npm.fluence.dev/-/web/detail/@fluencelabs/fluence/v/${{ env.FLUENCE_JS_VERSION }}) To install it run: ```shell - echo '@fluencelabs:registry=https://npm.fluence.dev/' > .npmrc - npm i @fluencelabs/fluence@${{ env.FLUENCE_JS_VERSION }} + npm login --registry https://npm.fluence.dev + npm i @fluencelabs/fluence@${{ env.FLUENCE_JS_VERSION }} --registry=https://npm.fluence.dev ``` From 0fdb810db42fc4762224b14fd6a8b2ce92562e2c Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 6 Sep 2022 15:38:22 +0300 Subject: [PATCH 12/16] Fix --- .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 30277e1bf..a2292b67c 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -84,7 +84,7 @@ jobs: - publish-snapshot env: - FLUENCE_JS_VERSION: ${{ needs.publish-snapshot.outputs.version }} + FLUENCE_JS_VERSION: ${{ needs.publish-snapshot.outputs.fluence-js-version }} steps: - name: Find comment From 02d5329b36f3c394a0df60b47cbedf974c3cfd96 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 6 Sep 2022 15:44:02 +0300 Subject: [PATCH 13/16] Use master branch of aqua-playground --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b89067a34..5703972f4 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -20,6 +20,6 @@ jobs: aqua-playground: needs: snapshot - uses: fluencelabs/aqua-playground/.github/workflows/tests.yml@marine-e2e + uses: fluencelabs/aqua-playground/.github/workflows/tests.yml@master with: fluence-js-version: ${{ needs.snapshot.outputs.fluence-js-version }} From 045208d1ee404a17cd5de0949a1f3b8f5d75bbe9 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 6 Sep 2022 15:48:47 +0300 Subject: [PATCH 14/16] Remove invalid `cache` key --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f6647d783..8a4bc9d8c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -81,7 +81,6 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} - cache: 'pnpm' - run: pnpm i - run: pnpm -r build From c1bf9acba76b4df5099ec61ce0de820ab5329683 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 6 Sep 2022 15:53:36 +0300 Subject: [PATCH 15/16] Update .github/workflows/run-tests.yml --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 5703972f4..a4f6abea8 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -2,7 +2,7 @@ name: Run tests on: pull_request: - paths-ignode: + paths-ignore: - "**.md" concurrency: From 59c32478f442da15ffafb9e1a0d76aff6b59952b Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 6 Sep 2022 16:56:37 +0300 Subject: [PATCH 16/16] Fix branch name in version --- .github/workflows/snapshot.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index a2292b67c..1cefe593e 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -56,11 +56,10 @@ jobs: - name: Generate package version id: version run: | - BRANCH=${GITHUB_REF#refs/heads/} SHA=$(git rev-parse --short HEAD) echo "::set-output name=sha::$SHA" - echo "::set-output name=branch::${BRANCH//[^a-zA-Z0-9-]/-}" + echo "::set-output name=branch::${GITHUB_HEAD_REF//[^a-zA-Z0-9-]/-}" - name: Set package version id: build