From 1edae814f44e68a7600c09851a4b118ec8d411da Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Mon, 20 Oct 2025 16:43:13 +0200 Subject: [PATCH 01/22] ci: Fix permissions of publish workflow --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f6f1854e..b486d4df 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,6 +10,7 @@ permissions: id-token: write # Required for OIDC packages: write contents: read + security-events: write # Required for uploading SARIF files jobs: build-and-test: From df8cd58a8b682d9886e5868b6cfd1d004dc84473 Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Mon, 20 Oct 2025 16:43:43 +0200 Subject: [PATCH 02/22] ci: Explicitly define main workflow permissions --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6544c801..c3e96ffe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,6 +11,10 @@ concurrency: group: ${{ github.ref }}-ci cancel-in-progress: true +permissions: + contents: read + security-events: write # Required for uploading SARIF files + jobs: build-and-test: runs-on: ubuntu-latest From 2078f91628e359912cf0b5f975d0c40cf66d95ba Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Mon, 20 Oct 2025 16:43:59 +0200 Subject: [PATCH 03/22] ci: Test permissions --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c3e96ffe..e643e7c9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ concurrency: permissions: contents: read - security-events: write # Required for uploading SARIF files + # security-events: write # Required for uploading SARIF files jobs: build-and-test: From bb2337631164c21f485ec9623722f48c8dfd54fc Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Mon, 20 Oct 2025 16:55:17 +0200 Subject: [PATCH 04/22] ci: Test npm publish workflow --- package-lock.json | 6 +++--- package.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index bc28e150..a7f536be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@iexec/poco", - "version": "6.1.0-contracts", + "version": "6.1.0-rc5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@iexec/poco", - "version": "6.1.0-contracts", + "version": "6.1.0-rc5", "license": "Apache-2.0", "dependencies": { "@iexec/interface": "3.0.35-8", @@ -22563,4 +22563,4 @@ } } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 7f17ffcb..268b4e1a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@iexec/poco", - "version": "6.1.0-contracts", + "version": "6.1.0-rc5", "description": "iExec Proof of Contribution protocol smart contracts", "author": "iExec", "license": "Apache-2.0", @@ -90,4 +90,4 @@ "bugs": { "url": "https://github.com/iExecBlockchainComputing/PoCo/issues" } -} +} \ No newline at end of file From 876bc2a03e90dbec27728158aee2c2b0f4cca31f Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Mon, 20 Oct 2025 17:37:48 +0200 Subject: [PATCH 05/22] chore: Debug CI --- .github/workflows/main.yml | 34 +++++++++++++++++----------------- .github/workflows/publish.yml | 14 +++++++++----- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e643e7c9..99fb2f77 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,8 +12,8 @@ concurrency: cancel-in-progress: true permissions: - contents: read - # security-events: write # Required for uploading SARIF files + contents: none + security-events: none # Required for uploading SARIF files jobs: build-and-test: @@ -30,21 +30,21 @@ jobs: run: npm ci - name: Build run: npm run build - - name: Check storage layout - run: npm run check-storage-layout - - name: Test deployment - run: npm run deploy - - name: Test Timelock deployment - run: npm run deploy:timelock - - name: Run coverage - run: npm run coverage - - name: Run partial native tests - run: npm run test:native - - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v4.0.1 - with: - token: ${{ secrets.CODECOV_TOKEN }} - slug: iExecBlockchainComputing/PoCo + # - name: Check storage layout + # run: npm run check-storage-layout + # - name: Test deployment + # run: npm run deploy + # - name: Test Timelock deployment + # run: npm run deploy:timelock + # - name: Run coverage + # run: npm run coverage + # - name: Run partial native tests + # run: npm run test:native + # - name: Upload coverage reports to Codecov + # uses: codecov/codecov-action@v4.0.1 + # with: + # token: ${{ secrets.CODECOV_TOKEN }} + # slug: iExecBlockchainComputing/PoCo - name: Run static analysis with Slither uses: crytic/slither-action@v0.4.0 with: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b486d4df..ea8a92b3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,11 +6,11 @@ on: tags: - 'v*' -permissions: - id-token: write # Required for OIDC - packages: write - contents: read - security-events: write # Required for uploading SARIF files +# permissions: +# id-token: write # Required for OIDC +# packages: write +# contents: read +# security-events: write # Required for uploading SARIF files jobs: build-and-test: @@ -18,4 +18,8 @@ jobs: publish: needs: build-and-test + permissions: + id-token: write # Required for OIDC + packages: write + contents: read uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/publish-npm.yml@publish-npm-v1.6.0 From 98523e1619a062f016ea52e31f5cf56d9dd75b30 Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Mon, 20 Oct 2025 17:52:50 +0200 Subject: [PATCH 06/22] chore: Debug CI --- .github/workflows/publish.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ea8a92b3..ccd08f24 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,10 +16,10 @@ jobs: build-and-test: uses: ./.github/workflows/main.yml - publish: - needs: build-and-test - permissions: - id-token: write # Required for OIDC - packages: write - contents: read - uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/publish-npm.yml@publish-npm-v1.6.0 + # publish: + # needs: build-and-test + # permissions: + # id-token: write # Required for OIDC + # packages: write + # contents: read + # uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/publish-npm.yml@publish-npm-v1.6.0 From 65143d289fdda7c355ffce9eb8467af3b45ff51a Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Mon, 20 Oct 2025 17:53:36 +0200 Subject: [PATCH 07/22] chore: Debug CI --- .github/workflows/publish.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ccd08f24..042c63b2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,8 +3,10 @@ name: Publish NPM Package on: push: - tags: - - 'v*' + branches: + - '*' + # tags: + # - 'v*' # permissions: # id-token: write # Required for OIDC From d88ea29690971c4f0edad9dca168bcbdbe0310e0 Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Mon, 20 Oct 2025 17:54:47 +0200 Subject: [PATCH 08/22] chore: Debug CI --- .github/workflows/publish-test.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/publish-test.yml diff --git a/.github/workflows/publish-test.yml b/.github/workflows/publish-test.yml new file mode 100644 index 00000000..952ddba2 --- /dev/null +++ b/.github/workflows/publish-test.yml @@ -0,0 +1,27 @@ +# ⚠️ THIS WORKFLOW IS THE TRUSTED PUBLISHER CONFIGURED ON NPMJS.COM, DO NOT RENAME OR DELETE THIS FILE ⚠️ +name: '!! Publish NPM Package --- TEST ---' + +on: + push: + branches: + - '*' + # tags: + # - 'v*' + +# permissions: +# id-token: write # Required for OIDC +# packages: write +# contents: read +# security-events: write # Required for uploading SARIF files + +jobs: + build-and-test: + uses: ./.github/workflows/main.yml + + # publish: + # needs: build-and-test + # permissions: + # id-token: write # Required for OIDC + # packages: write + # contents: read + # uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/publish-npm.yml@publish-npm-v1.6.0 From 122409f97881f7d549bfffa3be2a77640bf64c78 Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Mon, 20 Oct 2025 18:01:24 +0200 Subject: [PATCH 09/22] chore: Debug CI --- .github/workflows/publish-test.yml | 21 ++++++--------------- .github/workflows/publish.yml | 18 +++++++++++------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/.github/workflows/publish-test.yml b/.github/workflows/publish-test.yml index 952ddba2..bd69e2a2 100644 --- a/.github/workflows/publish-test.yml +++ b/.github/workflows/publish-test.yml @@ -5,23 +5,14 @@ on: push: branches: - '*' - # tags: - # - 'v*' - -# permissions: -# id-token: write # Required for OIDC -# packages: write -# contents: read -# security-events: write # Required for uploading SARIF files jobs: build-and-test: uses: ./.github/workflows/main.yml - # publish: - # needs: build-and-test - # permissions: - # id-token: write # Required for OIDC - # packages: write - # contents: read - # uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/publish-npm.yml@publish-npm-v1.6.0 + publish: + needs: build-and-test + runs-on: ubuntu-latest + steps: + - name: 'Test Publish Step 2' + run: echo "This is a test publish step 2." diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 042c63b2..49b779f6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,10 +18,14 @@ jobs: build-and-test: uses: ./.github/workflows/main.yml - # publish: - # needs: build-and-test - # permissions: - # id-token: write # Required for OIDC - # packages: write - # contents: read - # uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/publish-npm.yml@publish-npm-v1.6.0 + publish: + needs: build-and-test + permissions: + id-token: write # Required for OIDC + packages: write + contents: read + # uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/publish-npm.yml@publish-npm-v1.6.0 + runs-on: ubuntu-latest + steps: + - name: 'Test Publish Step' + run: echo "This is a test publish step." From 6ccf6b6788c9c49495002d2361ef077d28979626 Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Mon, 20 Oct 2025 18:04:27 +0200 Subject: [PATCH 10/22] chore: Debug CI --- .github/workflows/publish-test.yml | 1 + .github/workflows/publish.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/publish-test.yml b/.github/workflows/publish-test.yml index bd69e2a2..9c223485 100644 --- a/.github/workflows/publish-test.yml +++ b/.github/workflows/publish-test.yml @@ -5,6 +5,7 @@ on: push: branches: - '*' + pull_request: jobs: build-and-test: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 49b779f6..f89aa049 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -5,6 +5,7 @@ on: push: branches: - '*' + pull_request: # tags: # - 'v*' From a7bb320939035a7cdcf0f14bf2240e60ee91c795 Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Mon, 20 Oct 2025 18:08:29 +0200 Subject: [PATCH 11/22] chore: Debug CI --- .github/workflows/publish.yml | 3 --- .github/workflows/{publish-test.yml => test.yml} | 9 +++------ 2 files changed, 3 insertions(+), 9 deletions(-) rename .github/workflows/{publish-test.yml => test.yml} (62%) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f89aa049..b70a0cdf 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,9 +2,6 @@ name: Publish NPM Package on: - push: - branches: - - '*' pull_request: # tags: # - 'v*' diff --git a/.github/workflows/publish-test.yml b/.github/workflows/test.yml similarity index 62% rename from .github/workflows/publish-test.yml rename to .github/workflows/test.yml index 9c223485..1c82f0ab 100644 --- a/.github/workflows/publish-test.yml +++ b/.github/workflows/test.yml @@ -1,10 +1,7 @@ # ⚠️ THIS WORKFLOW IS THE TRUSTED PUBLISHER CONFIGURED ON NPMJS.COM, DO NOT RENAME OR DELETE THIS FILE ⚠️ -name: '!! Publish NPM Package --- TEST ---' +name: Test to debug CI on: - push: - branches: - - '*' pull_request: jobs: @@ -15,5 +12,5 @@ jobs: needs: build-and-test runs-on: ubuntu-latest steps: - - name: 'Test Publish Step 2' - run: echo "This is a test publish step 2." + - name: 'Test Debug' + run: echo "This is a test debug step." From da4405a52ce2cb89107e5a87c5c8368693becc77 Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Mon, 20 Oct 2025 18:14:28 +0200 Subject: [PATCH 12/22] chore: Clean CI --- .github/workflows/main.yml | 4 ---- .github/workflows/publish.yml | 18 ++++-------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 99fb2f77..2d8bfca6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,10 +11,6 @@ concurrency: group: ${{ github.ref }}-ci cancel-in-progress: true -permissions: - contents: none - security-events: none # Required for uploading SARIF files - jobs: build-and-test: runs-on: ubuntu-latest diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b70a0cdf..c11c60b5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,15 +2,9 @@ name: Publish NPM Package on: - pull_request: - # tags: - # - 'v*' - -# permissions: -# id-token: write # Required for OIDC -# packages: write -# contents: read -# security-events: write # Required for uploading SARIF files + push: + tags: + - 'v*' jobs: build-and-test: @@ -22,8 +16,4 @@ jobs: id-token: write # Required for OIDC packages: write contents: read - # uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/publish-npm.yml@publish-npm-v1.6.0 - runs-on: ubuntu-latest - steps: - - name: 'Test Publish Step' - run: echo "This is a test publish step." + uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/publish-npm.yml@publish-npm-v1.6.0 From 62ad2333a3ca67f6a10c44d53c6d4cb44f3432e6 Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Mon, 20 Oct 2025 18:14:41 +0200 Subject: [PATCH 13/22] chore: Clean CI --- .github/workflows/test.yml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 1c82f0ab..00000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,16 +0,0 @@ -# ⚠️ THIS WORKFLOW IS THE TRUSTED PUBLISHER CONFIGURED ON NPMJS.COM, DO NOT RENAME OR DELETE THIS FILE ⚠️ -name: Test to debug CI - -on: - pull_request: - -jobs: - build-and-test: - uses: ./.github/workflows/main.yml - - publish: - needs: build-and-test - runs-on: ubuntu-latest - steps: - - name: 'Test Debug' - run: echo "This is a test debug step." From 69bf4d86d6e8baa0aa3f50d5981d6137f017263b Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Tue, 21 Oct 2025 10:18:04 +0200 Subject: [PATCH 14/22] ci: Determine NPM package dist tag from git tag --- .github/workflows/publish.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c11c60b5..11b79f87 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,5 @@ # ⚠️ THIS WORKFLOW IS THE TRUSTED PUBLISHER CONFIGURED ON NPMJS.COM, DO NOT RENAME OR DELETE THIS FILE ⚠️ + name: Publish NPM Package on: @@ -10,10 +11,27 @@ jobs: build-and-test: uses: ./.github/workflows/main.yml - publish: + determine-dist-tag: needs: build-and-test + runs-on: ubuntu-latest + outputs: + TAG: ${{ steps.set-dist-tag.outputs.TAG }} + steps: + - name: Determine package dist tag + id: set-dist-tag + run: | + if [[ "${GITHUB_REF#refs/tags/}" == *"-rc"* ]]; then + echo "TAG=rc" >> $GITHUB_OUTPUT + else + echo "TAG=latest" >> $GITHUB_OUTPUT + fi + + publish: + needs: determine-dist-tag permissions: id-token: write # Required for OIDC packages: write contents: read uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/publish-npm.yml@publish-npm-v1.6.0 + with: + tag: ${{ needs.determine-dist-tag.outputs.TAG }} From ac4deb03231e4b8e27ad00753d2245be1048f4cd Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Tue, 21 Oct 2025 10:31:15 +0200 Subject: [PATCH 15/22] chore: Fix npm version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a7f536be..1ea5ed5e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@iexec/poco", - "version": "6.1.0-rc5", + "version": "6.1.0-rc.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@iexec/poco", - "version": "6.1.0-rc5", + "version": "6.1.0-rc.4", "license": "Apache-2.0", "dependencies": { "@iexec/interface": "3.0.35-8", diff --git a/package.json b/package.json index 268b4e1a..1d0d31b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@iexec/poco", - "version": "6.1.0-rc5", + "version": "6.1.0-rc.4", "description": "iExec Proof of Contribution protocol smart contracts", "author": "iExec", "license": "Apache-2.0", From 80df0c5029193b144e95ca6e2814a6e069012ca8 Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Tue, 21 Oct 2025 10:55:38 +0200 Subject: [PATCH 16/22] chore: Add prerelease command --- docs/README.md | 16 +++++++++++++++- package.json | 3 ++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/docs/README.md b/docs/README.md index e7c15e9f..e2b7fe80 100644 --- a/docs/README.md +++ b/docs/README.md @@ -150,7 +150,7 @@ npm run verify:all -- --network # e.g. arbitrum This script automatically reads all deployed contract addresses and their constructor arguments from the deployment artifacts and verifies them on the relevant block explorer. -### Formatting +### Format Format a specific file or files in a directory: ``` @@ -189,3 +189,17 @@ To render only storage diagrams: ``` npm run storage-to-diagrams ``` + +### Release + +- **Final releases** are automated using [Release Please](https://github.com/googleapis/release-please). Major, minor, and patch versions should be published through the corresponding GitHub Actions workflows. +- **Prereleases** (`vX.Y.Z-rc.*`) should be created manually using: + ``` + npm run prerelease + ``` + This command will: + - Bump the RC version in `package.json` and `package-lock.json` files. + - Create a new commit with the version bump. + - Generate the corresponding Git tag. + + There is no need to create a full GitHub release for prerelease versions, a Git tag is sufficient. diff --git a/package.json b/package.json index 1d0d31b2..d4740f4b 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,8 @@ "sol-to-uml": "npx zx scripts/tools/sol-to-uml.mjs", "puml-to-links": "npx zx scripts/tools/puml-to-links.mjs", "storage-to-diagrams": "bash scripts/tools/storage-to-diagrams.sh", - "doc": "npx hardhat docgen" + "doc": "npx hardhat docgen", + "prerelease": "npm version prerelease --preid=rc -m 'chore: v%s'" }, "files": [ "/abis", From bab12421b68eb6c9442c29b0c410acd5ded344b2 Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Tue, 21 Oct 2025 11:00:50 +0200 Subject: [PATCH 17/22] docs: Add note to readme --- docs/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index e2b7fe80..326bff94 100644 --- a/docs/README.md +++ b/docs/README.md @@ -202,4 +202,6 @@ npm run storage-to-diagrams - Create a new commit with the version bump. - Generate the corresponding Git tag. - There is no need to create a full GitHub release for prerelease versions, a Git tag is sufficient. + Running this command ensures that the version in package.json matches the Git tag. This alignment is required for correct package publication and to automatically determine the appropriate npm dist tag (see [publish.yml](../.github/workflows/publish.yml)). + + > Note: There is no need to create a full GitHub release for prerelease versions, a Git tag is sufficient. From e641ccd07fad8d99447af523c94e41b23ab1afaa Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Tue, 21 Oct 2025 11:01:19 +0200 Subject: [PATCH 18/22] chore: v6.1.0-rc.5 --- package-lock.json | 6 +++--- package.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1ea5ed5e..8d3a7ae7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@iexec/poco", - "version": "6.1.0-rc.4", + "version": "6.1.0-rc.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@iexec/poco", - "version": "6.1.0-rc.4", + "version": "6.1.0-rc.5", "license": "Apache-2.0", "dependencies": { "@iexec/interface": "3.0.35-8", @@ -22563,4 +22563,4 @@ } } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index d4740f4b..e487e850 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@iexec/poco", - "version": "6.1.0-rc.4", + "version": "6.1.0-rc.5", "description": "iExec Proof of Contribution protocol smart contracts", "author": "iExec", "license": "Apache-2.0", @@ -91,4 +91,4 @@ "bugs": { "url": "https://github.com/iExecBlockchainComputing/PoCo/issues" } -} \ No newline at end of file +} From 123230e78e58629b493fcaa72eb8f43689d66549 Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Tue, 21 Oct 2025 11:20:29 +0200 Subject: [PATCH 19/22] ci: Rename validation jobs --- .github/workflows/deploy.yml | 5 ++--- .github/workflows/publish.yml | 4 ++-- .github/workflows/upgrade-facets.yml | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c5f8b53d..cc7644e2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,12 +15,11 @@ on: default: 'hardhat' jobs: - # Build and test before deploying. - build-and-test: + pre-deploy: uses: ./.github/workflows/main.yml deploy: - needs: build-and-test + needs: pre-deploy runs-on: ubuntu-latest environment: ${{ inputs.network }} # Use the selected environment permissions: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 11b79f87..591fb1d1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,11 +8,11 @@ on: - 'v*' jobs: - build-and-test: + pre-publish: uses: ./.github/workflows/main.yml determine-dist-tag: - needs: build-and-test + needs: pre-publish runs-on: ubuntu-latest outputs: TAG: ${{ steps.set-dist-tag.outputs.TAG }} diff --git a/.github/workflows/upgrade-facets.yml b/.github/workflows/upgrade-facets.yml index 6aa98f9b..c9967d91 100644 --- a/.github/workflows/upgrade-facets.yml +++ b/.github/workflows/upgrade-facets.yml @@ -21,12 +21,11 @@ on: default: true jobs: - # Build and test before upgrading. - build-and-test: + pre-upgrade: uses: ./.github/workflows/main.yml upgrade: - needs: build-and-test + needs: pre-upgrade runs-on: ubuntu-latest environment: ${{ inputs.network }} # Use the selected environment permissions: From 2857d15edc4ecb45559d1ac0bd7b1e0ad157193d Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Tue, 21 Oct 2025 11:20:51 +0200 Subject: [PATCH 20/22] ci: Revert test changes --- .github/workflows/main.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2d8bfca6..6544c801 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,21 +26,21 @@ jobs: run: npm ci - name: Build run: npm run build - # - name: Check storage layout - # run: npm run check-storage-layout - # - name: Test deployment - # run: npm run deploy - # - name: Test Timelock deployment - # run: npm run deploy:timelock - # - name: Run coverage - # run: npm run coverage - # - name: Run partial native tests - # run: npm run test:native - # - name: Upload coverage reports to Codecov - # uses: codecov/codecov-action@v4.0.1 - # with: - # token: ${{ secrets.CODECOV_TOKEN }} - # slug: iExecBlockchainComputing/PoCo + - name: Check storage layout + run: npm run check-storage-layout + - name: Test deployment + run: npm run deploy + - name: Test Timelock deployment + run: npm run deploy:timelock + - name: Run coverage + run: npm run coverage + - name: Run partial native tests + run: npm run test:native + - name: Upload coverage reports to Codecov + uses: codecov/codecov-action@v4.0.1 + with: + token: ${{ secrets.CODECOV_TOKEN }} + slug: iExecBlockchainComputing/PoCo - name: Run static analysis with Slither uses: crytic/slither-action@v0.4.0 with: From e167e9f0c24108a2a94aacc159cb579e1c67ff80 Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Tue, 21 Oct 2025 11:32:01 +0200 Subject: [PATCH 21/22] chore: Add CODEOWNERS file for automatic review requests --- .github/CODEOWNERS | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000..79ec0059 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,4 @@ +# See https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners +# Code owners are automatically requested to review when a pull request is opened (read for review, not draft). + +* @zguesmi @gfournieriExec @Le-Caignec From f375c504d87b3192d7bc26a19221faf24bdbfe2d Mon Sep 17 00:00:00 2001 From: Zied <26070035+zguesmi@users.noreply.github.com> Date: Tue, 21 Oct 2025 12:08:30 +0200 Subject: [PATCH 22/22] chore: Update codeowners comments --- .github/CODEOWNERS | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 79ec0059..12da255d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,4 +1,10 @@ -# See https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners -# Code owners are automatically requested to review when a pull request is opened (read for review, not draft). +# Code owners are automatically requested to review when a pull request +# is opened (ready for review). +# See https://search.brave.com/search?q=About+code+owners+-+GitHub+Docs + +# A Ruleset is created in this GitHub repository to automatically request +# Copilot's review when pull requests are created as drafts or when they +# are ready for review. +# See https://github.com/iExecBlockchainComputing/PoCo/settings/rules/9055086 * @zguesmi @gfournieriExec @Le-Caignec