Skip to content

Commit

Permalink
Merge branch 'main' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
Adammatthiesen authored Dec 7, 2024
2 parents f2838a7 + 866814e commit 933ed7a
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/3-testimonial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this Testimonial submission
Thanks for taking the time to fill out this Testimonial submission!
- type: input
id: name
attributes:
label: "Desired Display Name"
description: "Would you like an alternate display name from your GitHub Profile (Optional)"
description: "Would you like an alternate display name from your GitHub Profile? (Optional)"
placeholder: "John Doe"
validations:
required: false
- type: input
id: handle
attributes:
label: "Desired Display Handle"
description: "Would you like an alternate display handle from your GitHub Profile (Optional)"
description: "Would you like an alternate display handle from your GitHub Profile? (Optional)"
placeholder: "@JohnDoe"
validations:
required: false
Expand Down
52 changes: 50 additions & 2 deletions .github/workflows/ci-push-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,15 @@ on:
branches:
- main

concurrency: ${{ github.workflow }}-${{ github.ref }}

permissions:
issues: write
repository-projects: read
contents: write
pull-requests: write
pages: write
id-token: write

jobs:
format:
Expand Down Expand Up @@ -35,9 +42,50 @@ jobs:
commit_user_name: studiocms-no-reply
commit_user_email: [email protected]
commit_author: StudioCMS <[email protected]>


changeset-release:
name: Changeset Release
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

- name: Install Tools & Dependencies
uses: ./.github/actions/install

- name: Create Release Pull Request or Publish to npm
id: changesets
uses: changesets/action@v1
with:
setupGitUser: true
commit: "👷 [ci]: Version Packages"
title: "👷 [ci]: Ready for Release"
version: pnpm ci:version
publish: pnpm ci:publish
env:
GITHUB_TOKEN: ${{ secrets.STUDIOCMS_SERVICE_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Add Label to CI PR
if: ${{ steps.changesets.outputs.hasChangesets == 'true' }}
run: gh pr edit "$PR_URL" --add-label "ci"
env:
PR_URL: ${{ steps.changesets.outputs.pull_request_url }}
GITHUB_TOKEN: ${{ secrets.STUDIOCMS_SERVICE_TOKEN }}

- name: Create Sentry release
if: steps.changesets.outputs.published == 'true'
uses: getsentry/action-release@v1
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_ORG: withstudiocms
SENTRY_URL: https://sentry.studiocms.dev/
with:
environment: production
projects: ui-testing

mergebot:
if: ${{ github.repository_owner == 'withstudiocms' && github.event_name == 'push' && github.event.commits[0].message != '[ci] lint' && github.event.commits[0].author.username != 'dependabot[bot]' }}
uses: withstudiocms/automations/.github/workflows/mergebot.yml@main
secrets:
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_MERGEBOT }}
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_MERGEBOT }}

0 comments on commit 933ed7a

Please sign in to comment.