From b5356375f1185121a4798a0efbf3e91696a9b59f Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Thu, 14 Sep 2023 11:30:11 +0300 Subject: [PATCH 01/10] 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/10] 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 6e0a3d0b6bf0445fe9b646b761ce92c6069c7787 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Thu, 23 May 2024 12:18:03 +0300 Subject: [PATCH 03/10] version updated --- .github/workflows/check_and_commit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index a08bcbd7b..e3441b63d 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -98,13 +98,13 @@ jobs: git add "$PACKAGE_LIB_PATH." -f done - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ${{ matrix.projectPath }}/Library key: Library-${{ matrix.projectPath }} restore-keys: | Library- - - uses: game-ci/unity-test-runner@v3 + - uses: game-ci/unity-test-runner@v4 id: tests env: UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} From 8c5b6942d8c72c9aa3bce37de497b49f5cfaae49 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Thu, 23 May 2024 12:19:33 +0300 Subject: [PATCH 04/10] check/test push --- .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..01ec2c702 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-fix ] 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-fix secrets: inherit \ No newline at end of file From 249b1c5ffd5bf07c039d148c08fe63c60a29587c Mon Sep 17 00:00:00 2001 From: rob1997 Date: Thu, 23 May 2024 12:22:37 +0300 Subject: [PATCH 05/10] typo fix --- .github/workflows/post_push_checks_and_commits.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/post_push_checks_and_commits.yml b/.github/workflows/post_push_checks_and_commits.yml index 01ec2c702..05c429bdd 100644 --- a/.github/workflows/post_push_checks_and_commits.yml +++ b/.github/workflows/post_push_checks_and_commits.yml @@ -7,5 +7,5 @@ on: jobs: check_and_commit: name: Check and Commit - uses: ChainSafe/web3.unity/.github/workflows/check_and_commit.yml@rob-ci-fix + uses: ChainSafe/web3.unity/.github/workflows/check_and_commit.yml@rob/ci-fix secrets: inherit \ No newline at end of file From e8d5d39e7cad03048f22660e152ab5dd10463d56 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Thu, 23 May 2024 12:44:35 +0300 Subject: [PATCH 06/10] updated version --- .github/workflows/check_and_commit.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index e3441b63d..d25a03966 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -98,18 +98,19 @@ jobs: git add "$PACKAGE_LIB_PATH." -f done - - uses: actions/cache@v3 + - uses: actions/cache@v2 with: path: ${{ matrix.projectPath }}/Library key: Library-${{ matrix.projectPath }} restore-keys: | Library- - - uses: game-ci/unity-test-runner@v4 + - uses: game-ci/unity-test-runner@v3.1.0 id: tests env: UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} with: projectPath: ${{ matrix.projectPath }} + unityVersion: '2022.3.26f1' testMode: ${{ matrix.testMode }} artifactsPath: ${{ matrix.testMode }}-artifacts githubToken: ${{ secrets.GITHUB_TOKEN }} From b0cff99fcbb5998d1b3e45b4e63fab4fb5cf64c8 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Thu, 23 May 2024 12:54:26 +0300 Subject: [PATCH 07/10] install latest docker --- .github/workflows/check_and_commit.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index d25a03966..17515101c 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -104,7 +104,15 @@ jobs: key: Library-${{ matrix.projectPath }} restore-keys: | Library- - - uses: game-ci/unity-test-runner@v3.1.0 + - name: Install Latest Docker + run: | + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + sudo apt-get update + sudo apt-get install docker-ce + - name: Check Docker Version + run: docker --version + - uses: game-ci/unity-test-runner@v3 id: tests env: UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} From ff5abf164ce1044d909b1459c29b43ae2300563f Mon Sep 17 00:00:00 2001 From: rob1997 Date: Thu, 23 May 2024 12:59:39 +0300 Subject: [PATCH 08/10] changed cache version --- .github/workflows/check_and_commit.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index 17515101c..97b9aea60 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -98,20 +98,12 @@ jobs: git add "$PACKAGE_LIB_PATH." -f done - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ${{ matrix.projectPath }}/Library key: Library-${{ matrix.projectPath }} restore-keys: | Library- - - name: Install Latest Docker - run: | - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt-get update - sudo apt-get install docker-ce - - name: Check Docker Version - run: docker --version - uses: game-ci/unity-test-runner@v3 id: tests env: From 4053d77a9897eb9fd376da0ca123f30af1ef464c Mon Sep 17 00:00:00 2001 From: rob1997 Date: Thu, 23 May 2024 13:10:46 +0300 Subject: [PATCH 09/10] reverted cache version and added custom image --- .github/workflows/check_and_commit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index 97b9aea60..b097f1752 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -98,7 +98,7 @@ jobs: git add "$PACKAGE_LIB_PATH." -f done - - uses: actions/cache@v3 + - uses: actions/cache@v2 with: path: ${{ matrix.projectPath }}/Library key: Library-${{ matrix.projectPath }} @@ -110,7 +110,7 @@ jobs: UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} with: projectPath: ${{ matrix.projectPath }} - unityVersion: '2022.3.26f1' + customImage: 'unityci/editor:ubuntu-2022.3.26f1-linux-il2cpp-3.1.0' testMode: ${{ matrix.testMode }} artifactsPath: ${{ matrix.testMode }}-artifacts githubToken: ${{ secrets.GITHUB_TOKEN }} From 914149954f517aac5f654bbe770440b9766f9414 Mon Sep 17 00:00:00 2001 From: rob1997 Date: Thu, 23 May 2024 13:27:23 +0300 Subject: [PATCH 10/10] reverted 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 05c429bdd..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-fix ] + branches: [ dev ] jobs: check_and_commit: name: Check and Commit - uses: ChainSafe/web3.unity/.github/workflows/check_and_commit.yml@rob/ci-fix + uses: ChainSafe/web3.unity/.github/workflows/check_and_commit.yml@main secrets: inherit \ No newline at end of file