diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index b097f1752..2eade7446 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -31,24 +31,23 @@ jobs: export DESTINATION_DIRECTORY= export DESTINATION_PATH= - export DUPLICATE_SAMPLE_VARS=${{ vars.DUPLICATE_SAMPLE_VARS }} - - for entry in "${DUPLICATE_SAMPLE_VARS[@]}" + while IFS= read -r entry || [ -n "$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 + done < "${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt" - name: update submodules # clone submodules run: | @@ -68,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 || [ -n "$entry" ]; do IFS=':' read -ra dirs <<< "$entry" export PACKAGE_LIB_PATH="${GITHUB_WORKSPACE}/${dirs[0]}" @@ -97,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/duplicate_samples.txt b/scripts/data/duplicate_samples.txt new file mode 100644 index 000000000..82aa82cc3 --- /dev/null +++ b/scripts/data/duplicate_samples.txt @@ -0,0 +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