From c211d2b42943576aa1e3abcfcf7f820692a37519 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Wed, 14 Sep 2022 16:54:08 +0300 Subject: [PATCH 01/10] Make comment a step instead of a job To save space on summary screen of github actions --- .github/workflows/snapshot.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 4e20840b9..b00730254 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -87,18 +87,8 @@ jobs: - name: Publish to self-hosted npm repo run: pnpm --no-git-checks --registry https://npm.fluence.dev -r publish --tag e2e -filter '@fluencelabs/*' - comment: - name: "Update comment" - runs-on: ubuntu-latest - - needs: - - publish-snapshot - - env: - FLUENCE_JS_VERSION: ${{ needs.publish-snapshot.outputs.fluence-js-version }} - steps: - - name: Find comment + - name: Find comment in PR uses: peter-evans/find-comment@v1 id: comment with: @@ -106,8 +96,10 @@ jobs: comment-author: github-actions[bot] body-includes: "## FluenceJS version is" - - name: Update comment + - name: Update comment in PR uses: peter-evans/create-or-update-comment@v1 + env: + FLUENCE_JS_VERSION: ${{ steps.build.ouputs.version }} with: comment-id: "${{ steps.comment.outputs.comment-id }}" issue-number: "${{ github.event.pull_request.number }}" From d936a6b4c2ec77402b64236ba27e1cd75ad8fcfa Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Wed, 14 Sep 2022 16:56:16 +0300 Subject: [PATCH 02/10] Build aqua with fluence-js snapshot --- .github/workflows/run-tests.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 527c36e50..2620c1980 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -16,8 +16,20 @@ jobs: snapshot: uses: ./.github/workflows/snapshot.yml + aqua-snapshot: + needs: + - snapshot + + uses: fluencelabs/aqua/.github/workflows/snapshot.yml@main + with: + fluence-js-version: ${{ needs.snapshot.outputs.fluence-js-version }} + aqua-playground: - needs: snapshot + needs: + - snapshot + - aqua-snapshot + uses: fluencelabs/aqua-playground/.github/workflows/tests.yml@master with: fluence-js-version: ${{ needs.snapshot.outputs.fluence-js-version }} + aqua-version: ${{ needs.aqua-snapshot.outputs.aqua-version }} From 01836588a6d345ce4c7e116a6cec9786a22d7665 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Wed, 14 Sep 2022 16:58:20 +0300 Subject: [PATCH 03/10] 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 b00730254..d56959d85 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -99,7 +99,7 @@ jobs: - name: Update comment in PR uses: peter-evans/create-or-update-comment@v1 env: - FLUENCE_JS_VERSION: ${{ steps.build.ouputs.version }} + FLUENCE_JS_VERSION: ${{ steps.build.outputs.version }} with: comment-id: "${{ steps.comment.outputs.comment-id }}" issue-number: "${{ github.event.pull_request.number }}" From 7038754dbb761fdc250fc600fe474061d43861f4 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Wed, 14 Sep 2022 16:58:50 +0300 Subject: [PATCH 04/10] Another typo --- .github/workflows/snapshot.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index d56959d85..dc7a357c5 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -87,7 +87,6 @@ jobs: - name: Publish to self-hosted npm repo run: pnpm --no-git-checks --registry https://npm.fluence.dev -r publish --tag e2e -filter '@fluencelabs/*' - steps: - name: Find comment in PR uses: peter-evans/find-comment@v1 id: comment From a3a8e34579047a325969b11fe10c3bfe58429b22 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Wed, 14 Sep 2022 17:05:55 +0300 Subject: [PATCH 05/10] Use short sha from branch --- .github/workflows/snapshot.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index dc7a357c5..f116be306 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -68,9 +68,8 @@ jobs: - name: Generate package version id: version run: | - SHA=$(git rev-parse --short HEAD) - - echo "::set-output name=sha::$SHA" + SHA=${{ github.event.pull_request.head.sha }} + echo "::set-output name=sha::${SHA::7}" echo "::set-output name=branch::${GITHUB_HEAD_REF//[^a-zA-Z0-9-]/-}" - name: Set package version From 408965270595d87abdd9c428eb5ff40e10e1180c Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Wed, 14 Sep 2022 17:12:01 +0300 Subject: [PATCH 06/10] Fix permissions? --- .github/workflows/snapshot.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index f116be306..52c7efb1e 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -24,7 +24,6 @@ jobs: fluence-js-version: "${{ steps.build.outputs.version }}" permissions: - contents: read id-token: write steps: From ba1d89b0adabaa42b755d9b69efbc79e36efd8c2 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Wed, 14 Sep 2022 17:16:46 +0300 Subject: [PATCH 07/10] Fix --- .github/workflows/snapshot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 52c7efb1e..43105c1df 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -24,6 +24,8 @@ jobs: fluence-js-version: "${{ steps.build.outputs.version }}" permissions: + contents: read + pull-requests: write id-token: write steps: From 3c2cec2b7243e1b1093ce9cc545ab736f1580124 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Wed, 14 Sep 2022 17:21:27 +0300 Subject: [PATCH 08/10] Install then set version --- .github/workflows/snapshot.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 43105c1df..b78c38c42 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -45,12 +45,13 @@ jobs: registry-url: "https://npm.fluence.dev" cache: "pnpm" + - run: pnpm i + - name: Set avm version from branch if: inputs.avm-version != '' working-directory: packages/fluence-js run: pnpm add @fluencelabs/avm@${{ inputs.avm-version }} - - run: pnpm i - run: pnpm -r build - name: Import secrets From 4c5c872f1671fe7b3f06b410a6af9845007746c1 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Wed, 14 Sep 2022 17:26:24 +0300 Subject: [PATCH 09/10] Better names --- .github/workflows/run-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2620c1980..d157dbb60 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,6 +14,7 @@ jobs: uses: ./.github/workflows/tests.yml snapshot: + name: "fluence-js" uses: ./.github/workflows/snapshot.yml aqua-snapshot: From 73546f2b23c3e09d5439cf6e6a3e05b76569def4 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Wed, 14 Sep 2022 17:28:02 +0300 Subject: [PATCH 10/10] Even better names --- .github/workflows/run-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index d157dbb60..c2a279823 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -18,6 +18,7 @@ jobs: uses: ./.github/workflows/snapshot.yml aqua-snapshot: + name: "aqua" needs: - snapshot