diff --git a/.github/workflows/cross_repos_build.yml b/.github/workflows/cross_repos_build.yml index d534e24d..0f20d194 100644 --- a/.github/workflows/cross_repos_build.yml +++ b/.github/workflows/cross_repos_build.yml @@ -6,4 +6,4 @@ on: jobs: call_workflow: - uses: vivoblueos/kernel/.github/workflows/reusable_cross_repos_build.yml@main + uses: ./.github/workflows/reusable_cross_repos_build.yml diff --git a/.github/workflows/reusable_cross_repos_build.yml b/.github/workflows/reusable_cross_repos_build.yml index 46ba30a3..f031ec52 100644 --- a/.github/workflows/reusable_cross_repos_build.yml +++ b/.github/workflows/reusable_cross_repos_build.yml @@ -1,5 +1,6 @@ name: Reusable trigger of building cross multiple repositories + on: workflow_call: @@ -63,7 +64,6 @@ jobs: }); fetched_prs.push({owner: owner, repo: repo, pr_num: pr_num, sha: pullRequest.head.sha}); })); - // Download diffs. await Promise.all(patchUrls.map(async ({ repo, url }) => { console.log(`Downloading ${url}`); @@ -87,13 +87,13 @@ jobs: for patch in patches/*.diff; do patch_abspath=$(realpath ${patch}) repo=$(basename ${patch} ".diff") - if [[ ${repo} != "manifests" ]];then + if [ "${repo}" != "manifests" ]; then cd ${repo} else cd .repo/${repo} fi git apply -3 --check --verbose ${patch_abspath} && git apply -3 --verbose ${patch_abspath} - if [[ $? != 0 ]]; then + if [ $? != 0 ]; then exit 1 fi cd - > /dev/null