From b5356375f1185121a4798a0efbf3e91696a9b59f Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Thu, 14 Sep 2023 11:30:11 +0300 Subject: [PATCH 01/20] Revert "automated duplicating imported samples modifications (#595)" This reverts commit a5558941827a91df51e2dd200648dcd13a1231c8. --- .github/workflows/duplicate_sample.yaml | 28 ------------------- duplicate_package_sample.sh | 14 ---------- .../Samples~/Web3.Unity/Prefabs.meta | 8 ------ .../Samples~/Web3.Unity/Scenes.meta | 8 ------ .../Samples~/Web3.Unity/Scripts.meta | 8 ------ .../Samples~/Web3.Unity/Sprites.meta | 8 ------ 6 files changed, 74 deletions(-) delete mode 100644 .github/workflows/duplicate_sample.yaml delete mode 100644 duplicate_package_sample.sh delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta diff --git a/.github/workflows/duplicate_sample.yaml b/.github/workflows/duplicate_sample.yaml deleted file mode 100644 index 793149e56..000000000 --- a/.github/workflows/duplicate_sample.yaml +++ /dev/null @@ -1,28 +0,0 @@ -name: Duplicate-Package-Sample - -on: - push: - branches: - - main - -jobs: - duplicate: - name: duplicate package sample - runs-on: ubuntu-latest - - steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Run duplicate script file - run: bash ${GITHUB_WORKSPACE}/duplicate_package_sample.sh - - - name: Commit and Push - run: | - git config --global user.email $git_email - git config --global user.name "${{ github.actor }}" - git add ./src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/. -f - git diff-index --cached --quiet HEAD || git commit -m "Auto-duplicate Package Samples" - git push - env: - git_email: "${{ github.actor }}@users.noreply.github.com" \ No newline at end of file diff --git a/duplicate_package_sample.sh b/duplicate_package_sample.sh deleted file mode 100644 index f3a677742..000000000 --- a/duplicate_package_sample.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# Specify the source directory and the destination directory -SOURCE_DIRECTORY="src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0-pre001/Web3.Unity Samples/" -DESTINATION_DIRECTORY="src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/" - -# clear destination directory first -rm -r "$DESTINATION_DIRECTORY" - -# Copy source to the destination -cp -r "$SOURCE_DIRECTORY" "$DESTINATION_DIRECTORY" - -#add all modified files -git add "src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/." -f \ No newline at end of file diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta deleted file mode 100644 index 5b35daff8..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 45a04d2621549e3458049c6c447c3941 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta deleted file mode 100644 index 5488a62ed..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f39f8dda9616349489a7803d7e0aff30 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta deleted file mode 100644 index 9a1e8b8d4..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eaef630f284e6e04a88b5939e0eb1cc5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta deleted file mode 100644 index 7175ee89d..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0c06517aee7843642a091a67c72b1379 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From cd514db5c9d0bb82e069293c669733864d41544e Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Wed, 7 Feb 2024 13:35:15 +0300 Subject: [PATCH 02/20] made main package testable, revert due to a mistake --- src/UnitySampleProject/Packages/manifest.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/UnitySampleProject/Packages/manifest.json b/src/UnitySampleProject/Packages/manifest.json index 08c0ac92f..22a37ba40 100644 --- a/src/UnitySampleProject/Packages/manifest.json +++ b/src/UnitySampleProject/Packages/manifest.json @@ -47,5 +47,8 @@ "com.unity.modules.wind": "1.0.0", "com.unity.modules.xr": "1.0.0", "com.tools.webglthreadingpatcher": "https://github.com/VolodymyrBS/WebGLThreadingPatcher.git" - } + }, + "testables": [ + "io.chainsafe.web3-unity" + ] } \ No newline at end of file From a03ca3a910a1405b92ca744c02e022c4fe899e8e Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 15:39:17 +0300 Subject: [PATCH 03/20] moved duplicate samples from vars to txt --- .github/workflows/check_and_commit.yml | 2 +- scripts/data/duplicate_samples.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 scripts/data/duplicate_samples.txt diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index b097f1752..781b50bdf 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -31,7 +31,7 @@ jobs: export DESTINATION_DIRECTORY= export DESTINATION_PATH= - export DUPLICATE_SAMPLE_VARS=${{ vars.DUPLICATE_SAMPLE_VARS }} + export DUPLICATE_SAMPLE_VARS=($(<${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt)) for entry in "${DUPLICATE_SAMPLE_VARS[@]}" do diff --git a/scripts/data/duplicate_samples.txt b/scripts/data/duplicate_samples.txt new file mode 100644 index 000000000..3e9054f6b --- /dev/null +++ b/scripts/data/duplicate_samples.txt @@ -0,0 +1 @@ +("src/UnitySampleProject/Assets/Samples/web3.unity SDK:Web3.Unity Samples:Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/" "src/UnitySampleProject/Assets/Samples/web3.unity SDK Web3Auth:Web3.Unity Web3Auth Samples:Packages/io.chainsafe.web3-unity.web3auth/Samples~/Web3.Unity Web3Auth/" "src/UnitySampleProject/Assets/Samples/web3.unity SDK Lootboxes:Chainlink Lootbox Sample:Packages/io.chainsafe.web3-unity.lootboxes/Samples~/Chainlink Lootbox Samples/" "src/UnitySampleProject/Assets/Samples/web3.unity SDK Ramp:Web3.Unity Ramp Samples:Packages/io.chainsafe.web3-unity.ramp/Samples~/Web3.Unity Ramp Samples/") \ No newline at end of file From 17e371b6663aad07d1b8f20be68389cf87b7b544 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 15:39:26 +0300 Subject: [PATCH 04/20] ci test --- .github/workflows/post_push_checks_and_commits.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/post_push_checks_and_commits.yml b/.github/workflows/post_push_checks_and_commits.yml index 5cd430cf3..57344a077 100644 --- a/.github/workflows/post_push_checks_and_commits.yml +++ b/.github/workflows/post_push_checks_and_commits.yml @@ -2,10 +2,10 @@ name: Post Push Checks and Commits on: push: - branches: [ dev ] + branches: [ rob/ci-improvement ] jobs: check_and_commit: name: Check and Commit - uses: ChainSafe/web3.unity/.github/workflows/check_and_commit.yml@main + uses: ChainSafe/web3.unity/.github/workflows/check_and_commit.yml@rob/ci-improvement secrets: inherit \ No newline at end of file From b2c59c225d7e7516f9001d75d58d3087dc01e032 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 15:41:40 +0300 Subject: [PATCH 05/20] possible fix --- scripts/data/duplicate_samples.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/data/duplicate_samples.txt b/scripts/data/duplicate_samples.txt index 3e9054f6b..7d8ee46b1 100644 --- a/scripts/data/duplicate_samples.txt +++ b/scripts/data/duplicate_samples.txt @@ -1 +1 @@ -("src/UnitySampleProject/Assets/Samples/web3.unity SDK:Web3.Unity Samples:Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/" "src/UnitySampleProject/Assets/Samples/web3.unity SDK Web3Auth:Web3.Unity Web3Auth Samples:Packages/io.chainsafe.web3-unity.web3auth/Samples~/Web3.Unity Web3Auth/" "src/UnitySampleProject/Assets/Samples/web3.unity SDK Lootboxes:Chainlink Lootbox Sample:Packages/io.chainsafe.web3-unity.lootboxes/Samples~/Chainlink Lootbox Samples/" "src/UnitySampleProject/Assets/Samples/web3.unity SDK Ramp:Web3.Unity Ramp Samples:Packages/io.chainsafe.web3-unity.ramp/Samples~/Web3.Unity Ramp Samples/") \ No newline at end of file +"src/UnitySampleProject/Assets/Samples/web3.unity SDK:Web3.Unity Samples:Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/" "src/UnitySampleProject/Assets/Samples/web3.unity SDK Web3Auth:Web3.Unity Web3Auth Samples:Packages/io.chainsafe.web3-unity.web3auth/Samples~/Web3.Unity Web3Auth/" "src/UnitySampleProject/Assets/Samples/web3.unity SDK Lootboxes:Chainlink Lootbox Sample:Packages/io.chainsafe.web3-unity.lootboxes/Samples~/Chainlink Lootbox Samples/" "src/UnitySampleProject/Assets/Samples/web3.unity SDK Ramp:Web3.Unity Ramp Samples:Packages/io.chainsafe.web3-unity.ramp/Samples~/Web3.Unity Ramp Samples/" \ No newline at end of file From eead4bfd7a7c8f2b5323587568324a1d7d0d01ff Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 15:45:08 +0300 Subject: [PATCH 06/20] possible fix 2 --- .github/workflows/check_and_commit.yml | 2 ++ scripts/data/duplicate_samples.txt | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index 781b50bdf..7f3794448 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -32,6 +32,8 @@ jobs: export DESTINATION_PATH= export DUPLICATE_SAMPLE_VARS=($(<${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt)) + DUPLICATE_SAMPLE_VARS="${DUPLICATE_SAMPLE_VARS//$'\n'/ }" + DUPLICATE_SAMPLE_VARS="${DUPLICATE_SAMPLE_VARS//$'\r'/}" for entry in "${DUPLICATE_SAMPLE_VARS[@]}" do diff --git a/scripts/data/duplicate_samples.txt b/scripts/data/duplicate_samples.txt index 7d8ee46b1..82aa82cc3 100644 --- a/scripts/data/duplicate_samples.txt +++ b/scripts/data/duplicate_samples.txt @@ -1 +1,4 @@ -"src/UnitySampleProject/Assets/Samples/web3.unity SDK:Web3.Unity Samples:Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/" "src/UnitySampleProject/Assets/Samples/web3.unity SDK Web3Auth:Web3.Unity Web3Auth Samples:Packages/io.chainsafe.web3-unity.web3auth/Samples~/Web3.Unity Web3Auth/" "src/UnitySampleProject/Assets/Samples/web3.unity SDK Lootboxes:Chainlink Lootbox Sample:Packages/io.chainsafe.web3-unity.lootboxes/Samples~/Chainlink Lootbox Samples/" "src/UnitySampleProject/Assets/Samples/web3.unity SDK Ramp:Web3.Unity Ramp Samples:Packages/io.chainsafe.web3-unity.ramp/Samples~/Web3.Unity Ramp Samples/" \ No newline at end of file +src/UnitySampleProject/Assets/Samples/web3.unity SDK:Web3.Unity Samples:Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/ +src/UnitySampleProject/Assets/Samples/web3.unity SDK Web3Auth:Web3.Unity Web3Auth Samples:Packages/io.chainsafe.web3-unity.web3auth/Samples~/Web3.Unity Web3Auth/ +src/UnitySampleProject/Assets/Samples/web3.unity SDK Lootboxes:Chainlink Lootbox Sample:Packages/io.chainsafe.web3-unity.lootboxes/Samples~/Chainlink Lootbox Samples/ +src/UnitySampleProject/Assets/Samples/web3.unity SDK Ramp:Web3.Unity Ramp Samples:Packages/io.chainsafe.web3-unity.ramp/Samples~/Web3.Unity Ramp Samples/ \ No newline at end of file From 9dd850994d4d95f5e8890b5a964dee43e8c99211 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 15:59:17 +0300 Subject: [PATCH 07/20] added a debug echo --- .github/workflows/check_and_commit.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index 7f3794448..378a3d4c1 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -35,6 +35,8 @@ jobs: DUPLICATE_SAMPLE_VARS="${DUPLICATE_SAMPLE_VARS//$'\n'/ }" DUPLICATE_SAMPLE_VARS="${DUPLICATE_SAMPLE_VARS//$'\r'/}" + echo "$DUPLICATE_SAMPLE_VARS" + for entry in "${DUPLICATE_SAMPLE_VARS[@]}" do IFS=':' read -ra dirs <<< "$entry" From 6573a5e78d7dd2ef03bf43c28993567ea8854f96 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 16:03:56 +0300 Subject: [PATCH 08/20] fix 3 --- .github/workflows/check_and_commit.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index 378a3d4c1..d7661e05a 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -31,12 +31,11 @@ jobs: export DESTINATION_DIRECTORY= export DESTINATION_PATH= - export DUPLICATE_SAMPLE_VARS=($(<${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt)) + export DUPLICATE_SAMPLE_VARS='$(<${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt)' + echo "$DUPLICATE_SAMPLE_VARS" DUPLICATE_SAMPLE_VARS="${DUPLICATE_SAMPLE_VARS//$'\n'/ }" DUPLICATE_SAMPLE_VARS="${DUPLICATE_SAMPLE_VARS//$'\r'/}" - echo "$DUPLICATE_SAMPLE_VARS" - for entry in "${DUPLICATE_SAMPLE_VARS[@]}" do IFS=':' read -ra dirs <<< "$entry" From ed0584d290d9dc8c64b00c4fc7ccae5509753156 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 16:04:46 +0300 Subject: [PATCH 09/20] fix 4 --- .github/workflows/check_and_commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index d7661e05a..36cdaaab9 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -31,7 +31,7 @@ jobs: export DESTINATION_DIRECTORY= export DESTINATION_PATH= - export DUPLICATE_SAMPLE_VARS='$(<${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt)' + export DUPLICATE_SAMPLE_VARS=$(<${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt) echo "$DUPLICATE_SAMPLE_VARS" DUPLICATE_SAMPLE_VARS="${DUPLICATE_SAMPLE_VARS//$'\n'/ }" DUPLICATE_SAMPLE_VARS="${DUPLICATE_SAMPLE_VARS//$'\r'/}" From ae07aa21001850c38e80c504ffbe45218ed628ab Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 16:06:11 +0300 Subject: [PATCH 10/20] fix 5 --- .github/workflows/check_and_commit.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index 36cdaaab9..23c7d0ace 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -32,9 +32,6 @@ jobs: export DESTINATION_PATH= export DUPLICATE_SAMPLE_VARS=$(<${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt) - echo "$DUPLICATE_SAMPLE_VARS" - DUPLICATE_SAMPLE_VARS="${DUPLICATE_SAMPLE_VARS//$'\n'/ }" - DUPLICATE_SAMPLE_VARS="${DUPLICATE_SAMPLE_VARS//$'\r'/}" for entry in "${DUPLICATE_SAMPLE_VARS[@]}" do From f16c745ed5c4d03c6d7eaa9a4222b9ae139ca2d4 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 16:23:50 +0300 Subject: [PATCH 11/20] fix 6 --- .github/workflows/check_and_commit.yml | 13 ++++++++----- scripts/data/duplicate_samples.txt | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index 23c7d0ace..0753f10a0 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -31,23 +31,26 @@ jobs: export DESTINATION_DIRECTORY= export DESTINATION_PATH= - export DUPLICATE_SAMPLE_VARS=$(<${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt) - - for entry in "${DUPLICATE_SAMPLE_VARS[@]}" + while IFS= read -r entry do IFS=':' read -ra dirs <<< "$entry" SOURCE_PATH=${dirs[0]} DESTINATION_DIRECTORY=${dirs[1]} - + SOURCE_PATH="${GITHUB_WORKSPACE}/$SOURCE_PATH/$(ls "$SOURCE_PATH" | head -n 1)/$DESTINATION_DIRECTORY" DESTINATION_PATH="${GITHUB_WORKSPACE}/${dirs[2]}" - + rm -rf "$DESTINATION_PATH" mkdir -p "$DESTINATION_PATH" cp -r "$SOURCE_PATH/." "$DESTINATION_PATH" git add "$DESTINATION_PATH." -f + done < "${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt" + + for entry in "${DUPLICATE_SAMPLE_VARS[@]}" + do + done - name: update submodules # clone submodules diff --git a/scripts/data/duplicate_samples.txt b/scripts/data/duplicate_samples.txt index 82aa82cc3..66f2f6ea1 100644 --- a/scripts/data/duplicate_samples.txt +++ b/scripts/data/duplicate_samples.txt @@ -1,4 +1,4 @@ src/UnitySampleProject/Assets/Samples/web3.unity SDK:Web3.Unity Samples:Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/ src/UnitySampleProject/Assets/Samples/web3.unity SDK Web3Auth:Web3.Unity Web3Auth Samples:Packages/io.chainsafe.web3-unity.web3auth/Samples~/Web3.Unity Web3Auth/ src/UnitySampleProject/Assets/Samples/web3.unity SDK Lootboxes:Chainlink Lootbox Sample:Packages/io.chainsafe.web3-unity.lootboxes/Samples~/Chainlink Lootbox Samples/ -src/UnitySampleProject/Assets/Samples/web3.unity SDK Ramp:Web3.Unity Ramp Samples:Packages/io.chainsafe.web3-unity.ramp/Samples~/Web3.Unity Ramp Samples/ \ No newline at end of file +src/UnitySampleProject/Assets/Samples/web3.unity SDK Ramp:Web3.Unity Ramp Samples:Packages/io.chainsafe.web3-unity.ramp/Samples~/Web3.Unity Ramp Samples/ From 16451543686ab720759cc08618d1ac5e895d04b5 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 16:26:47 +0300 Subject: [PATCH 12/20] fix 7 --- .github/workflows/check_and_commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index 0753f10a0..82bab9630 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -46,7 +46,7 @@ jobs: cp -r "$SOURCE_PATH/." "$DESTINATION_PATH" git add "$DESTINATION_PATH." -f - done < "${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt" + done <"${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt" for entry in "${DUPLICATE_SAMPLE_VARS[@]}" do From 1ea1e46f14c0b9c556d76ea05e0cba2ee7966257 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 16:28:51 +0300 Subject: [PATCH 13/20] fix 8 --- .github/workflows/check_and_commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index 82bab9630..fd21ed5a0 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -46,7 +46,7 @@ jobs: cp -r "$SOURCE_PATH/." "$DESTINATION_PATH" git add "$DESTINATION_PATH." -f - done <"${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt" + done < ${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt for entry in "${DUPLICATE_SAMPLE_VARS[@]}" do From dd3ce82bb63fdf8efc4fcfb3270891a6283df892 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 16:31:11 +0300 Subject: [PATCH 14/20] fix 9 --- .github/workflows/check_and_commit.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index fd21ed5a0..147347d74 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -31,6 +31,8 @@ jobs: export DESTINATION_DIRECTORY= export DESTINATION_PATH= + export DUPLICATE_SAMPLE_VARS=(<${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt) + while IFS= read -r entry do IFS=':' read -ra dirs <<< "$entry" @@ -46,7 +48,7 @@ jobs: cp -r "$SOURCE_PATH/." "$DESTINATION_PATH" git add "$DESTINATION_PATH." -f - done < ${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt + done < $DUPLICATE_SAMPLE_VARS for entry in "${DUPLICATE_SAMPLE_VARS[@]}" do From 7778ee5e5dfb8460dd74bbef674b11f493b55b5c Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 16:33:18 +0300 Subject: [PATCH 15/20] fix 10 --- .github/workflows/check_and_commit.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index 147347d74..2c824dae4 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -31,9 +31,7 @@ jobs: export DESTINATION_DIRECTORY= export DESTINATION_PATH= - export DUPLICATE_SAMPLE_VARS=(<${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt) - - while IFS= read -r entry + cat "${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt" | while IFS= read -r entry do IFS=':' read -ra dirs <<< "$entry" SOURCE_PATH=${dirs[0]} @@ -48,7 +46,7 @@ jobs: cp -r "$SOURCE_PATH/." "$DESTINATION_PATH" git add "$DESTINATION_PATH." -f - done < $DUPLICATE_SAMPLE_VARS + done for entry in "${DUPLICATE_SAMPLE_VARS[@]}" do From 73749af2fc5194139286ba84f702876fb442619b Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 16:34:57 +0300 Subject: [PATCH 16/20] fix 11 --- .github/workflows/check_and_commit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index 2c824dae4..085ce4ead 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -33,6 +33,7 @@ jobs: cat "${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt" | while IFS= read -r entry do + IFS=':' read -ra dirs <<< "$entry" SOURCE_PATH=${dirs[0]} DESTINATION_DIRECTORY=${dirs[1]} From ada204f8e9e01c382ad788bbc6fb3fa65292be46 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 16:37:40 +0300 Subject: [PATCH 17/20] fix 12 --- .github/workflows/check_and_commit.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index 085ce4ead..77639d6c9 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -31,7 +31,7 @@ jobs: export DESTINATION_DIRECTORY= export DESTINATION_PATH= - cat "${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt" | while IFS= read -r entry + while IFS= read -r entry do IFS=':' read -ra dirs <<< "$entry" @@ -47,12 +47,7 @@ jobs: cp -r "$SOURCE_PATH/." "$DESTINATION_PATH" git add "$DESTINATION_PATH." -f - done - - for entry in "${DUPLICATE_SAMPLE_VARS[@]}" - do - - done + done < "${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt" - name: update submodules # clone submodules run: | From f4fb505a940dbc35dec48017b96dfbf1335218e0 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 16:51:46 +0300 Subject: [PATCH 18/20] made publish dependencies check line by line --- .github/workflows/check_and_commit.yml | 9 ++------- scripts/data/published_dependencies.txt | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index 77639d6c9..20eeda892 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -67,14 +67,9 @@ jobs: echo -e "DLLs Generated\n$(ls "$PUBLISH_PATH")" - export PACKAGE_DEPENDENCIES=($(<${GITHUB_WORKSPACE}/scripts/data/published_dependencies.txt)) - - PACKAGE_DEPENDENCIES="${PACKAGE_DEPENDENCIES//$'\n'/ }" - PACKAGE_DEPENDENCIES="${PACKAGE_DEPENDENCIES//$'\r'/}" - export DLL_META_FILE_TEMPLATE="${{ vars.DLL_META_FILE_TEMPLATE }}" - for entry in "${PACKAGE_DEPENDENCIES[@]}" + while IFS= read -r entry do IFS=':' read -ra dirs <<< "$entry" export PACKAGE_LIB_PATH="${GITHUB_WORKSPACE}/${dirs[0]}" @@ -96,7 +91,7 @@ jobs: done git add "$PACKAGE_LIB_PATH." -f - done + done < "${GITHUB_WORKSPACE}/scripts/data/published_dependencies.txt" - uses: actions/cache@v2 with: path: ${{ matrix.projectPath }}/Library diff --git a/scripts/data/published_dependencies.txt b/scripts/data/published_dependencies.txt index a12f33d70..561773fb9 100644 --- a/scripts/data/published_dependencies.txt +++ b/scripts/data/published_dependencies.txt @@ -1,2 +1,2 @@ Packages/io.chainsafe.web3-unity/Runtime/Libraries/:ADRaffy.ENSNormalize;Nethereum.Model;BouncyCastle.Crypto;Nethereum.RLP;ChainSafe.Gaming.Debugging;Nethereum.RPC;ChainSafe.Gaming.Gelato;ChainSafe.Gaming.SygmaClient;Nethereum.Signer.EIP712;ChainSafe.Gaming.InProcessSigner;Nethereum.Signer;ChainSafe.Gaming.InProcessTransactionExecutor;Nethereum.Util;ChainSafe.Gaming.Unity.ThirdParty;Nethereum.Web3;ChainSafe.Gaming.Unity;System.Buffers;ChainSafe.Gaming.WalletConnect;System.Memory;ChainSafe.Gaming;System.Numerics.Vectors;Microsoft.Bcl.AsyncInterfaces;System.Reactive;Microsoft.Extensions.DependencyInjection.Abstractions;System.Runtime.CompilerServices.Unsafe;Microsoft.Extensions.DependencyInjection;System.Runtime.InteropServices.WindowsRuntime;Microsoft.Extensions.Logging.Abstractions;System.Security.Cryptography.Cng;Microsoft.IdentityModel.Abstractions;System.Text.Encodings.Web;Microsoft.IdentityModel.Logging;System.Text.Json;Microsoft.IdentityModel.Tokens;System.Threading.Channels;NBitcoin;System.Threading.Tasks.Extensions;Nethereum.ABI;WalletConnectSharp.Auth;Nethereum.Accounts;WalletConnectSharp.Common;WalletConnectSharp.Events;Nethereum.BlockchainProcessing;WalletConnectSharp.Core;Nethereum.Contracts;WalletConnectSharp.Crypto;Nethereum.Hex;Nethereum.JsonRpc.Client;WalletConnectSharp.Network.Websocket;Nethereum.JsonRpc.IpcClient;WalletConnectSharp.Network;Nethereum.JsonRpc.RpcClient;WalletConnectSharp.Sign;Nethereum.KeyStore;WalletConnectSharp.Storage;Nethereum.Merkle.Patricia;WalletConnectSharp.Web3Wallet;Nethereum.Merkle;Websocket.Client;Nethereum.Metamask;Nethereum.Siwe.Core;Nethereum.Siwe;Nethereum.UI;Nethereum.Unity.Metamask;Nethereum.Unity;ChainSafe.Gaming.MetaMask;ChainSafe.Gaming.MetaMask.Unity;ChainSafe.Gaming.InProcessTransactionExecutor.Unity;ChainSafe.Gaming.Marketplace -Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/:Chainsafe.Gaming.Chainlink;ChainSafe.Gaming.Lootboxes.Chainlink \ No newline at end of file +Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/:Chainsafe.Gaming.Chainlink;ChainSafe.Gaming.Lootboxes.Chainlink From 0978d65d0972bc2453e0d32aadbba983c962f2f6 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 16:56:34 +0300 Subject: [PATCH 19/20] new line fix --- .github/workflows/check_and_commit.yml | 4 ++-- scripts/data/duplicate_samples.txt | 2 +- scripts/data/published_dependencies.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index 20eeda892..2eade7446 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -31,7 +31,7 @@ jobs: export DESTINATION_DIRECTORY= export DESTINATION_PATH= - while IFS= read -r entry + while IFS= read -r entry || [ -n "$entry" ]; do IFS=':' read -ra dirs <<< "$entry" @@ -69,7 +69,7 @@ jobs: export DLL_META_FILE_TEMPLATE="${{ vars.DLL_META_FILE_TEMPLATE }}" - while IFS= read -r entry + while IFS= read -r entry || [ -n "$entry" ]; do IFS=':' read -ra dirs <<< "$entry" export PACKAGE_LIB_PATH="${GITHUB_WORKSPACE}/${dirs[0]}" diff --git a/scripts/data/duplicate_samples.txt b/scripts/data/duplicate_samples.txt index 66f2f6ea1..82aa82cc3 100644 --- a/scripts/data/duplicate_samples.txt +++ b/scripts/data/duplicate_samples.txt @@ -1,4 +1,4 @@ src/UnitySampleProject/Assets/Samples/web3.unity SDK:Web3.Unity Samples:Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/ src/UnitySampleProject/Assets/Samples/web3.unity SDK Web3Auth:Web3.Unity Web3Auth Samples:Packages/io.chainsafe.web3-unity.web3auth/Samples~/Web3.Unity Web3Auth/ src/UnitySampleProject/Assets/Samples/web3.unity SDK Lootboxes:Chainlink Lootbox Sample:Packages/io.chainsafe.web3-unity.lootboxes/Samples~/Chainlink Lootbox Samples/ -src/UnitySampleProject/Assets/Samples/web3.unity SDK Ramp:Web3.Unity Ramp Samples:Packages/io.chainsafe.web3-unity.ramp/Samples~/Web3.Unity Ramp Samples/ +src/UnitySampleProject/Assets/Samples/web3.unity SDK Ramp:Web3.Unity Ramp Samples:Packages/io.chainsafe.web3-unity.ramp/Samples~/Web3.Unity Ramp Samples/ \ No newline at end of file diff --git a/scripts/data/published_dependencies.txt b/scripts/data/published_dependencies.txt index 561773fb9..a12f33d70 100644 --- a/scripts/data/published_dependencies.txt +++ b/scripts/data/published_dependencies.txt @@ -1,2 +1,2 @@ Packages/io.chainsafe.web3-unity/Runtime/Libraries/:ADRaffy.ENSNormalize;Nethereum.Model;BouncyCastle.Crypto;Nethereum.RLP;ChainSafe.Gaming.Debugging;Nethereum.RPC;ChainSafe.Gaming.Gelato;ChainSafe.Gaming.SygmaClient;Nethereum.Signer.EIP712;ChainSafe.Gaming.InProcessSigner;Nethereum.Signer;ChainSafe.Gaming.InProcessTransactionExecutor;Nethereum.Util;ChainSafe.Gaming.Unity.ThirdParty;Nethereum.Web3;ChainSafe.Gaming.Unity;System.Buffers;ChainSafe.Gaming.WalletConnect;System.Memory;ChainSafe.Gaming;System.Numerics.Vectors;Microsoft.Bcl.AsyncInterfaces;System.Reactive;Microsoft.Extensions.DependencyInjection.Abstractions;System.Runtime.CompilerServices.Unsafe;Microsoft.Extensions.DependencyInjection;System.Runtime.InteropServices.WindowsRuntime;Microsoft.Extensions.Logging.Abstractions;System.Security.Cryptography.Cng;Microsoft.IdentityModel.Abstractions;System.Text.Encodings.Web;Microsoft.IdentityModel.Logging;System.Text.Json;Microsoft.IdentityModel.Tokens;System.Threading.Channels;NBitcoin;System.Threading.Tasks.Extensions;Nethereum.ABI;WalletConnectSharp.Auth;Nethereum.Accounts;WalletConnectSharp.Common;WalletConnectSharp.Events;Nethereum.BlockchainProcessing;WalletConnectSharp.Core;Nethereum.Contracts;WalletConnectSharp.Crypto;Nethereum.Hex;Nethereum.JsonRpc.Client;WalletConnectSharp.Network.Websocket;Nethereum.JsonRpc.IpcClient;WalletConnectSharp.Network;Nethereum.JsonRpc.RpcClient;WalletConnectSharp.Sign;Nethereum.KeyStore;WalletConnectSharp.Storage;Nethereum.Merkle.Patricia;WalletConnectSharp.Web3Wallet;Nethereum.Merkle;Websocket.Client;Nethereum.Metamask;Nethereum.Siwe.Core;Nethereum.Siwe;Nethereum.UI;Nethereum.Unity.Metamask;Nethereum.Unity;ChainSafe.Gaming.MetaMask;ChainSafe.Gaming.MetaMask.Unity;ChainSafe.Gaming.InProcessTransactionExecutor.Unity;ChainSafe.Gaming.Marketplace -Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/:Chainsafe.Gaming.Chainlink;ChainSafe.Gaming.Lootboxes.Chainlink +Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/:Chainsafe.Gaming.Chainlink;ChainSafe.Gaming.Lootboxes.Chainlink \ No newline at end of file From af1a8a4466c7ff104b4bf1c828ad9c58f27a147c Mon Sep 17 00:00:00 2001 From: rob1997 Date: Wed, 29 May 2024 16:56:57 +0300 Subject: [PATCH 20/20] revert test changes --- .github/workflows/post_push_checks_and_commits.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/post_push_checks_and_commits.yml b/.github/workflows/post_push_checks_and_commits.yml index 57344a077..5cd430cf3 100644 --- a/.github/workflows/post_push_checks_and_commits.yml +++ b/.github/workflows/post_push_checks_and_commits.yml @@ -2,10 +2,10 @@ name: Post Push Checks and Commits on: push: - branches: [ rob/ci-improvement ] + branches: [ dev ] jobs: check_and_commit: name: Check and Commit - uses: ChainSafe/web3.unity/.github/workflows/check_and_commit.yml@rob/ci-improvement + uses: ChainSafe/web3.unity/.github/workflows/check_and_commit.yml@main secrets: inherit \ No newline at end of file