Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
dixyes committed Aug 26, 2023
1 parent f740543 commit dcf787e
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/macos-new.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,10 @@ jobs:
"" \
"" \
"--phpVer=${{ matrix.phpVer }}" \
"--versionFile=/versionFile"
"--versionFile=./versionFile"
matched_key="${{ steps.cache-restore.outputs.cache-matched-key }}"
src_hash="$(sha256sum /versionFile | head -c 64)"
src_hash="$(sha256sum ./versionFile | head -c 64)"
if [ "$matched_key" != "${matched_key##*${src_hash}}" ]
then
echo "srcHash=" >> "$GITHUB_OUTPUT"
Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:
# "" \
# "" \
# --phpVer={$matrix['phpVer']} \
# --versionFile=/versionFile
# --versionFile=./versionFile
# ret="\$?"
# echo "::endgroup::"
Expand All @@ -229,8 +229,8 @@ jobs:
# fi
echo "::group::Show versions"
cat /versionFile
sha256sum /versionFile
cat ./versionFile
sha256sum ./versionFile
echo "::endgroup::"
BASH);
Expand Down Expand Up @@ -311,9 +311,9 @@ jobs:
echo "::error::failed build $flavor $sapi"
else
# copy the built bin out
mkdir -p /out/{$flavor}
cp $targetBin /out/{$flavor}/$binName
cp $targetBin.debug /out/{$flavor}/$binName.debug
mkdir -p ./out/{$flavor}
cp $targetBin ./out/{$flavor}/$binName
cp $targetBin.debug ./out/{$flavor}/$binName.debug
fi
BASH);
}
Expand All @@ -322,11 +322,11 @@ jobs:
echo "::group::Dump $flavor licenses"
# dump licenses
php ../dump_licenses.php \
"/out/{$flavor}/licenses" \
"./out/{$flavor}/licenses" \
"$libraries" \
"$extensions"
# copy versionFile
cp /versionFile "/out/{$flavor}/versionFile"
cp ./versionFile "./out/{$flavor}/versionFile"
echo "::endgroup::"
fi
Expand All @@ -341,13 +341,13 @@ jobs:
run: |
set +e
. /tmp/build.sh
# mkdir -p /out/min
# touch /out/min/micro.sfx
# mkdir -p ./out/min
# touch ./out/min/micro.sfx
# php ../dump_licenses.php \
# "/out/min/licenses" \
# "./out/min/licenses" \
# "libffi" \
# "ffi"
# cp /versionFile "/out/min/versionFile"
# cp ./versionFile "./out/min/versionFile"
- name: Setup node
if: always()
Expand Down Expand Up @@ -395,11 +395,11 @@ jobs:
let artifacts = {};
let results = {};
let versionFile = await fs.readFile('/versionFile');
let versionFile = await fs.readFile('build/versionFile');
let srcHash = crypto.createHash('sha256').update(versionFile).digest('hex');
for (const flavor of flavors) {
let dir = `/out/${flavor}`;
let dir = `build/out/${flavor}`;
for (const sapi of sapis) {
let binPath = `${dir}/${binFile[sapi]}`;
try {
Expand Down

0 comments on commit dcf787e

Please sign in to comment.