Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update GitHub Actions workflows. #361

Merged
merged 1 commit into from
May 31, 2024
Merged

Update GitHub Actions workflows. #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/run-acceptance-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,18 @@ jobs:
- name: Workflow is not a success
if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'skipped')
run: exit 1
- uses: guibranco/github-status-action-v2@0849440ec82c5fa69b2377725b9b7852a3977e76
with:
authToken: ${{secrets.GITHUB_TOKEN}}
# Write an explicit status check called "Sentinel" which will only pass if this code really runs.
# Once rolled out, we can make this the only required check for PRs,
# then remove the old conditionals on this job and remove the previous step.
context: 'Sentinel'
description: 'All required checks passed'
state: 'success'
# Write to the PR commit SHA if it's available as we don't want the merge commit sha,
# otherwise use the current SHA for any other type of build.
sha: ${{ github.event.pull_request.head.sha || github.sha }}
- name: Workflow is a success
run: echo "🎉🎈🎉🎈🎉"

Expand Down
16 changes: 6 additions & 10 deletions scripts/upstream.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,13 @@ start_rebase() {
rm -rf .git/modules/upstream/rebase-merge
cd upstream && git fetch

if [ -z "$TO" ]; then
echo "\$TO not set, assuming TO is the upstream SHA currently committed."
else
git checkout "$TO"
fi

git branch -f local
if [ -n "$FROM" ]; then
git checkout -B pulumi-patch "$FROM"
echo "Rebasing from $FROM to $(git rev-parse HEAD)"
git checkout -B pulumi-patch "$FROM"
else
git checkout -B pulumi-patch
echo "Rebasing in place at $(git rev-parse HEAD)"
git checkout -B pulumi-patch
fi
git branch --set-upstream-to=local pulumi-patch

Expand Down Expand Up @@ -120,7 +116,7 @@ assert_rebase_in_progress() {
Didn't detect an upstream rebase in progress.
To start an upstream rebase, run

[FROM=vX.Y.Z] [TO=vA.B.C] make upstream.rebase
[FROM=vX.Y.Z] make upstream.rebase

If you are absolutly sure you are already in a rebase, run

Expand Down Expand Up @@ -149,7 +145,7 @@ make "$1"' failed to apply ${patch}. This is because there is a conflict between
the checked out version of upstream and the patch set. To resolve this conflict
run:

FROM=\$LAST_KNOWN_GOOD_COMMIT TO=\$NEW_COMMIT make upstream.rebase
FROM=\$LAST_KNOWN_GOOD_COMMIT make upstream.rebase

This will walk you through resolving the conflict and producing a patch set that
cleanly applies to the current upstream.
Expand Down
Loading