Skip to content

Commit 13ba9f9

Browse files
committed
Merge branch 'main' into dev
2 parents 5ed5ae3 + df91961 commit 13ba9f9

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

.github/workflows/check_and_commit.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,23 @@ jobs:
3131
export DESTINATION_DIRECTORY=
3232
export DESTINATION_PATH=
3333
34-
export DUPLICATE_SAMPLE_VARS=${{ vars.DUPLICATE_SAMPLE_VARS }}
35-
36-
for entry in "${DUPLICATE_SAMPLE_VARS[@]}"
34+
while IFS= read -r entry || [ -n "$entry" ];
3735
do
36+
3837
IFS=':' read -ra dirs <<< "$entry"
3938
SOURCE_PATH=${dirs[0]}
4039
DESTINATION_DIRECTORY=${dirs[1]}
41-
40+
4241
SOURCE_PATH="${GITHUB_WORKSPACE}/$SOURCE_PATH/$(ls "$SOURCE_PATH" | head -n 1)/$DESTINATION_DIRECTORY"
4342
4443
DESTINATION_PATH="${GITHUB_WORKSPACE}/${dirs[2]}"
45-
44+
4645
rm -rf "$DESTINATION_PATH"
4746
mkdir -p "$DESTINATION_PATH"
4847
cp -r "$SOURCE_PATH/." "$DESTINATION_PATH"
4948
5049
git add "$DESTINATION_PATH." -f
51-
done
50+
done < "${GITHUB_WORKSPACE}/scripts/data/duplicate_samples.txt"
5251
- name: update submodules
5352
# clone submodules
5453
run: |
@@ -68,14 +67,9 @@ jobs:
6867
6968
echo -e "DLLs Generated\n$(ls "$PUBLISH_PATH")"
7069
71-
export PACKAGE_DEPENDENCIES=($(<${GITHUB_WORKSPACE}/scripts/data/published_dependencies.txt))
72-
73-
PACKAGE_DEPENDENCIES="${PACKAGE_DEPENDENCIES//$'\n'/ }"
74-
PACKAGE_DEPENDENCIES="${PACKAGE_DEPENDENCIES//$'\r'/}"
75-
7670
export DLL_META_FILE_TEMPLATE="${{ vars.DLL_META_FILE_TEMPLATE }}"
7771
78-
for entry in "${PACKAGE_DEPENDENCIES[@]}"
72+
while IFS= read -r entry || [ -n "$entry" ];
7973
do
8074
IFS=':' read -ra dirs <<< "$entry"
8175
export PACKAGE_LIB_PATH="${GITHUB_WORKSPACE}/${dirs[0]}"
@@ -97,7 +91,7 @@ jobs:
9791
done
9892
9993
git add "$PACKAGE_LIB_PATH." -f
100-
done
94+
done < "${GITHUB_WORKSPACE}/scripts/data/published_dependencies.txt"
10195
- uses: actions/cache@v2
10296
with:
10397
path: ${{ matrix.projectPath }}/Library

0 commit comments

Comments
 (0)