From 382acd3a2861e05ed67fd9001e7c80e548f4e60e Mon Sep 17 00:00:00 2001 From: VRamakrishna Date: Tue, 27 Aug 2024 07:32:21 +0000 Subject: [PATCH 1/4] Updating MAINTAINERS.md info and removing dead code Signed-off-by: VRamakrishna --- MAINTAINERS.md | 10 ++++++---- tests/network-setups/fabric/dev/scripts/deployCC.sh | 6 ------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 3632ddba7..6677c6e52 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -14,12 +14,13 @@ Changes to this list can be done by submitting a PR which is approved by a simpl | Dileban Karunamoorthy | [dileban][dileban] | | | Allison Irvin | [airvin][airvin] | | | Antony Targett | [AntTargett][AntTargett] | | -| Sandeep Nishad | [sanvenDev][sanvenDev] | | +| Sandeep Nishad | [sandeepnRES][sandeepnRES] | | | Krishnasuri Narayanam | [knarayan][knarayan] | | | Dhinakaran Vinayagamurthy | [dhinakaran2705][dhinakaran2705] | | | Yining Hu | [Yining-Hu][Yining-Hu] | | | Vinayaka Pandit | [Vinayaka-Pandit][Vinayaka-Pandit] | | -| Christian Vecchiola | [Christian-Vecchiola][Christian-Vecchiola] | | +| Christian Vecchiola | [hyp0th3rmi4][hyp0th3rmi4] | | +| Sikhar Patranabis | [SIKHAR405][SIKHAR405] | | [VRamakrishna]: https://github.com/VRamakrishna [ermyas]: https://github.com/ermyas @@ -27,9 +28,10 @@ Changes to this list can be done by submitting a PR which is approved by a simpl [dileban]: https://github.com/dileban [airvin]: https://github.com/airvin [AntTargett]: https://github.com/AntTargett -[sanvenDev]: https://github.com/sanvenDev +[sandeepnRES]: https://github.com/sandeepnRES/ [knarayan]: https://github.com/knarayan [dhinakaran2705]: https://github.com/dhinakaran2705 [Yining-Hu]: https://github.com//Yining-Hu [Vinayaka-Pandit]: https://github.com/Vinayaka-Pandit -[Christian-Vecchiola]: https://github.com/hyp0th3rmi4 +[hyp0th3rmi4]: https://github.com/hyp0th3rmi4 +[SIKHAR405]: https://github.com/SIKHAR405 diff --git a/tests/network-setups/fabric/dev/scripts/deployCC.sh b/tests/network-setups/fabric/dev/scripts/deployCC.sh index 9e6ff728e..2c4945b8c 100755 --- a/tests/network-setups/fabric/dev/scripts/deployCC.sh +++ b/tests/network-setups/fabric/dev/scripts/deployCC.sh @@ -51,14 +51,8 @@ export NW_NAME=${NW_NAME} if [ "$CC_SRC_LANGUAGE" = "go" -o "$CC_SRC_LANGUAGE" = "golang" ] ; then CC_RUNTIME_LANGUAGE=golang - #CC_SRC_PATH="./chaincode/fabcar/go/" CC_SRC_PATH="$APP_R/fabric/shared/chaincode/$CC_CHAIN_CODE" echo "Preparing for deployment of :" $CC_SRC_PATH - #pushd ./chaincode/snamcc - #GO111MODULE=on go mod init snamcc - #GO111MODULE=on go mod vendor - #popd - #echo Finished vendoring Go dependencies sleep 1 elif [ "$CC_SRC_LANGUAGE" = "javascript" ]; then From ad2c2e73ef7f4960bab6686400ce631e3d6c10ee Mon Sep 17 00:00:00 2001 From: VRamakrishna Date: Tue, 27 Aug 2024 11:27:45 +0000 Subject: [PATCH 2/4] Upgraded Node version to 18 in all relevant GitHub Actions Signed-off-by: VRamakrishna --- .github/workflows/deploy_docs.yml | 5 ++--- .github/workflows/test_asset-exchange-besu.yml | 8 ++++---- .github/workflows/test_asset-transfer.yml | 4 ++-- .github/workflows/test_data-sharing.yml | 4 ++-- .github/workflows/test_node-pkgs.yml | 8 ++++---- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index b9cf58181..88e3689bf 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -21,10 +21,10 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v4.1.1 - - name: Use Node.js 16.x + - name: Use Node.js 18.x uses: actions/setup-node@v2 with: - node-version: 16.x + node-version: 18.x - name: NPM INSTALL run: npm install @@ -39,4 +39,3 @@ jobs: with: branch: gh-pages # The branch the action should deploy to. folder: docs/build # The folder the action should deploy. - \ No newline at end of file diff --git a/.github/workflows/test_asset-exchange-besu.yml b/.github/workflows/test_asset-exchange-besu.yml index 40c05371a..bb9c1a247 100644 --- a/.github/workflows/test_asset-exchange-besu.yml +++ b/.github/workflows/test_asset-exchange-besu.yml @@ -40,10 +40,10 @@ jobs: java-version: '11' distribution: 'adopt' - - name: Use Node.js 16.x + - name: Use Node.js 18.x uses: actions/setup-node@v4.0.2 with: - node-version: 16.x + node-version: 18.x - name: Use Protoc 3.15 run: | @@ -219,10 +219,10 @@ jobs: java-version: '11' distribution: 'adopt' - - name: Use Node.js 16.x + - name: Use Node.js 18.x uses: actions/setup-node@v4.0.2 with: - node-version: 16.x + node-version: 18.x - name: Use Protoc 3.15 run: | diff --git a/.github/workflows/test_asset-transfer.yml b/.github/workflows/test_asset-transfer.yml index cf83cb986..b8c297b4f 100644 --- a/.github/workflows/test_asset-transfer.yml +++ b/.github/workflows/test_asset-transfer.yml @@ -430,10 +430,10 @@ jobs: with: go-version: '1.20.2' - - name: Use Node.js 16.x + - name: Use Node.js 18.x uses: actions/setup-node@v2 with: - node-version: 16.x + node-version: 18.x - name: Install RUST Toolchain minimal stable with clippy and rustfmt uses: actions-rs/toolchain@v1 diff --git a/.github/workflows/test_data-sharing.yml b/.github/workflows/test_data-sharing.yml index ddf8db657..3e7b29c0e 100644 --- a/.github/workflows/test_data-sharing.yml +++ b/.github/workflows/test_data-sharing.yml @@ -723,10 +723,10 @@ jobs: with: go-version: '1.20.2' - - name: Use Node.js 16.x + - name: Use Node.js 18.x uses: actions/setup-node@v2 with: - node-version: 16.x + node-version: 18.x - name: Install RUST Toolchain minimal stable with clippy and rustfmt uses: actions-rs/toolchain@v1 diff --git a/.github/workflows/test_node-pkgs.yml b/.github/workflows/test_node-pkgs.yml index d240d6c06..f095d3727 100644 --- a/.github/workflows/test_node-pkgs.yml +++ b/.github/workflows/test_node-pkgs.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: - node-version: [14.x, 16.x] + node-version: [14.x, 16.x, 18.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: @@ -55,7 +55,7 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [18.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: @@ -89,10 +89,10 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v4.1.1 - - name: Use Node.js 16.x + - name: Use Node.js 18.x uses: actions/setup-node@v2 with: - node-version: 16.x + node-version: 18.x - name: NPM INSTALL run: npm install From 2f24d80dbf432718802115cdc056dacef66578ea Mon Sep 17 00:00:00 2001 From: VRamakrishna Date: Wed, 4 Sep 2024 08:49:09 +0000 Subject: [PATCH 3/4] Updating Ethsigner version in github actions Also updated Sandeep's email in the MAINTAINERS.md file. Signed-off-by: VRamakrishna --- .github/workflows/test_asset-exchange-besu.yml | 12 ++++++------ MAINTAINERS.md | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test_asset-exchange-besu.yml b/.github/workflows/test_asset-exchange-besu.yml index bb9c1a247..240245142 100644 --- a/.github/workflows/test_asset-exchange-besu.yml +++ b/.github/workflows/test_asset-exchange-besu.yml @@ -64,9 +64,9 @@ jobs: wget https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.0/besu-22.7.0.zip unzip besu-22.7.0.zip export PATH="${PWD}/besu-22.7.0/bin:$PATH" - wget https://artifacts.consensys.net/public/ethsigner/raw/names/ethsigner.zip/versions/22.1.3/ethsigner-22.1.3.zip - unzip ethsigner-22.1.3.zip - export PATH="${PWD}/ethsigner-22.1.3/bin:$PATH" + wget https://artifacts.consensys.net/public/ethsigner/raw/names/ethsigner.zip/versions/23.6.0/ethsigner-23.6.0.zip + unzip ethsigner-23.6.0.zip + export PATH="${PWD}/ethsigner-23.6.0/bin:$PATH" make start sleep 100 working-directory: tests/network-setups/besu @@ -255,9 +255,9 @@ jobs: wget https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.0/besu-22.7.0.zip unzip besu-22.7.0.zip export PATH="${PWD}/besu-22.7.0/bin:$PATH" - wget https://artifacts.consensys.net/public/ethsigner/raw/names/ethsigner.zip/versions/22.1.3/ethsigner-22.1.3.zip - unzip ethsigner-22.1.3.zip - export PATH="${PWD}/ethsigner-22.1.3/bin:$PATH" + wget https://artifacts.consensys.net/public/ethsigner/raw/names/ethsigner.zip/versions/23.6.0/ethsigner-23.6.0.zip + unzip ethsigner-23.6.0.zip + export PATH="${PWD}/ethsigner-23.6.0/bin:$PATH" make start sleep 100 working-directory: tests/network-setups/besu diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 6677c6e52..cbf70f4be 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -14,7 +14,7 @@ Changes to this list can be done by submitting a PR which is approved by a simpl | Dileban Karunamoorthy | [dileban][dileban] | | | Allison Irvin | [airvin][airvin] | | | Antony Targett | [AntTargett][AntTargett] | | -| Sandeep Nishad | [sandeepnRES][sandeepnRES] | | +| Sandeep Nishad | [sandeepnRES][sandeepnRES] | | | Krishnasuri Narayanam | [knarayan][knarayan] | | | Dhinakaran Vinayagamurthy | [dhinakaran2705][dhinakaran2705] | | | Yining Hu | [Yining-Hu][Yining-Hu] | | From 30bc3350aa50bc51a0fcc72da52af34e1f559f60 Mon Sep 17 00:00:00 2001 From: VRamakrishna Date: Wed, 4 Sep 2024 09:00:28 +0000 Subject: [PATCH 4/4] Updating Node version to 20 in Besu Github actions Signed-off-by: VRamakrishna --- .github/workflows/test_asset-exchange-besu.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_asset-exchange-besu.yml b/.github/workflows/test_asset-exchange-besu.yml index 240245142..e47a4dcbb 100644 --- a/.github/workflows/test_asset-exchange-besu.yml +++ b/.github/workflows/test_asset-exchange-besu.yml @@ -40,10 +40,10 @@ jobs: java-version: '11' distribution: 'adopt' - - name: Use Node.js 18.x + - name: Use Node.js 20.x uses: actions/setup-node@v4.0.2 with: - node-version: 18.x + node-version: 20.x - name: Use Protoc 3.15 run: | @@ -219,10 +219,10 @@ jobs: java-version: '11' distribution: 'adopt' - - name: Use Node.js 18.x + - name: Use Node.js 20.x uses: actions/setup-node@v4.0.2 with: - node-version: 18.x + node-version: 20.x - name: Use Protoc 3.15 run: |