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

Jump to bottom

ci: Preliminary support for GitHub merge queues #37

Merged
merged 1 commit into from
Aug 10, 2023
Merged

ci: Preliminary support for GitHub merge queues #37

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ jobs:
- uses: Swatinem/rust-cache@6720f05bc48b77f96918929a9019fb2203ff71f8 # v2.0.0
with:
shared-key: pulumi-watch-${{ matrix.target }}
- name: Apt update
run: sudo apt update
if: contains(matrix.target, 'linux')
- name: Add musl tools
run: sudo apt install -y musl musl-dev musl-tools
if: endsWith(matrix.target, '-musl')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ jobs:
- run: |
# These vars are format strings.
# shellcheck disable=SC2016
go run github.com/rhysd/actionlint/cmd/actionlint@v1.6.15 \
go run github.com/rhysd/actionlint/cmd/actionlint@v1.6.25 \
-format '{{range $err := .}}::error file={{$err.Filepath}},line={{$err.Line}},col={{$err.Column}}::{{$err.Message}}%0A```%0A{{replace $err.Snippet "\\n" "%0A"}}%0A```\n{{end}}' -ignore 'SC2016:'
1 change: 1 addition & 0 deletions .github/workflows/ci-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ jobs:
run: sha512sum pulumi-watch-* | tee SHA512SUMS

- name: Sign checksums
if: false # TODO(https://github.com/pulumi/watchutil-rs/issues/40): This step is currently broken.
shell: bash
env:
RELEASE_KEY: ${{ secrets.RELEASE_KEY }}
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Merge

on:
merge_group:
push:
branches:
- staging
Expand Down Expand Up @@ -30,11 +31,11 @@ jobs:

./.github/scripts/set-output version "${VERSION}"
- name: Install git-cliff
uses: baptiste0928/cargo-install@bf6758885262d0e6f61089a9d8c8790d3ac3368f # v1.3.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious why this is unpinned? Best practice is to pin to a commit SHA.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AaronFriel I'm just trying to get the build passing, seems it's been red for a while. I'll change it.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AaronFriel the remaining failure is on the release step, and I'm pretty out of my element. It seems like pu/pu migrated to cosign in pulumi/pulumi#11310, so my plan was to try porting that over to this repo. Would love to hear if you have alternatives before I go down that path.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussed 1:1, I've disabled the signing step.

uses: baptiste0928/cargo-install@30f432979e99f3ea66a8fa2eede53c07063995d8 # v2.1.0
with:
crate: git-cliff
args: --git https://github.com/AaronFriel/git-cliff --rev 702c79236ef0b0a3d2430f73902db3339933fbfd
version: 0.8.1
git: https://github.com/AaronFriel/git-cliff
commit: 702c79236ef0b0a3d2430f73902db3339933fbfd
- name: Extract release notes
id: notes
shell: bash
Expand Down Expand Up @@ -120,7 +121,7 @@ jobs:
name: Publish
needs: [test-ok, version-check, info]
uses: ./.github/workflows/ci-publish.yml
if: ${{ github.ref_name == 'staging' }}
if: github.ref_name == 'staging' || github.event_name == 'merge_group'
with:
version: ${{ needs.info.outputs.version }}
release_notes: ${{ needs.info.outputs.release_notes }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-check-commit-changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
with:
fetch-depth: 0
- name: Install git-cliff
uses: baptiste0928/cargo-install@bf6758885262d0e6f61089a9d8c8790d3ac3368f # v1.3.0
uses: baptiste0928/cargo-install@30f432979e99f3ea66a8fa2eede53c07063995d8 # v2.1.0
with:
crate: git-cliff
args: --git https://github.com/AaronFriel/git-cliff --rev 702c79236ef0b0a3d2430f73902db3339933fbfd
version: 0.8.1
git: https://github.com/AaronFriel/git-cliff
commit: 702c79236ef0b0a3d2430f73902db3339933fbfd
- name: Changelog
id: changelog
env:
Expand Down