mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-29 20:01:26 +00:00
Merge branch 'main' into feat/printer-agent-infra
This commit is contained in:
@@ -103,9 +103,9 @@ jobs:
|
|||||||
|
|
||||||
if [ "$changed" = true ]; then
|
if [ "$changed" = true ]; then
|
||||||
dispatch_id="${GITHUB_RUN_ID}-${branch//\//-}"
|
dispatch_id="${GITHUB_RUN_ID}-${branch//\//-}"
|
||||||
# Record successful dispatches for the barrier step below. A
|
# Record successful dispatches for the barrier step below.
|
||||||
# dispatch failure prevents clearing, so the branch is retried
|
# Branches whose workflow predates workflow_dispatch are skipped
|
||||||
# on the next cron run.
|
# with a warning, as they were before the barrier was added.
|
||||||
if gh workflow run post_merge_profiles.yml \
|
if gh workflow run post_merge_profiles.yml \
|
||||||
--repo "${{ github.repository }}" \
|
--repo "${{ github.repository }}" \
|
||||||
--ref "$branch" \
|
--ref "$branch" \
|
||||||
@@ -113,8 +113,7 @@ jobs:
|
|||||||
-f ofl_cron_dispatch_id="$dispatch_id"; then
|
-f ofl_cron_dispatch_id="$dispatch_id"; then
|
||||||
printf '%s\t%s\n' "$branch" "$dispatch_id" >> "$RUNNER_TEMP/ofl-dispatches.tsv"
|
printf '%s\t%s\n' "$branch" "$dispatch_id" >> "$RUNNER_TEMP/ofl-dispatches.tsv"
|
||||||
else
|
else
|
||||||
echo "::error::failed to dispatch post_merge_profiles.yml for $branch"
|
echo "::warning::skipping $branch because post_merge_profiles.yml could not be dispatched at that ref"
|
||||||
printf '%s\n' "$branch" >> "$RUNNER_TEMP/ofl-dispatch-failures.txt"
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -127,16 +126,9 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
DISPATCHES_FILE: ${{ runner.temp }}/ofl-dispatches.tsv
|
DISPATCHES_FILE: ${{ runner.temp }}/ofl-dispatches.tsv
|
||||||
DISPATCH_FAILURES_FILE: ${{ runner.temp }}/ofl-dispatch-failures.txt
|
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
if [ -s "$DISPATCH_FAILURES_FILE" ]; then
|
|
||||||
echo "::error::one or more OFL publisher workflows could not be dispatched:"
|
|
||||||
sed 's/^/ - /' "$DISPATCH_FAILURES_FILE"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -s "$DISPATCHES_FILE" ]; then
|
if [ ! -s "$DISPATCHES_FILE" ]; then
|
||||||
echo "No OFL publisher workflows were dispatched; pending queue will not be cleared."
|
echo "No OFL publisher workflows were dispatched; pending queue will not be cleared."
|
||||||
echo "publishers_dispatched=false" >> "$GITHUB_OUTPUT"
|
echo "publishers_dispatched=false" >> "$GITHUB_OUTPUT"
|
||||||
|
|||||||
Reference in New Issue
Block a user