Skip to content

Commit

Permalink
Merge pull request #640 from rgoldberg/638-release-improvements
Browse files Browse the repository at this point in the history
Release improvements
  • Loading branch information
rgoldberg authored Dec 23, 2024
2 parents d39c8e5 + 82e2810 commit c8dc938
Show file tree
Hide file tree
Showing 59 changed files with 465 additions and 1,934 deletions.
8 changes: 0 additions & 8 deletions .actrc

This file was deleted.

38 changes: 13 additions & 25 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,39 +1,27 @@
# http://editorconfig.org
# https://editorconfig.org
root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[script/*]
indent_size = 2

[*.{yml,yaml}]
[*.json]
indent_size = 2

# Use 2 spaces for Ruby files
[{Podfile,Rakefile,script/*,*.{podspec,rb,yml}}]
indent_size = 2
indent_style = space
max_line_length = 80
# Trailing spaces have meaning in Markdown
[*.md]
trim_trailing_whitespace = false

# Use tabs for property lists
[*.plist]
indent_style = tab

# JSON files contain newlines inconsistently
[*.json]
[*.yml]
indent_size = 2
insert_final_newline = ignore

# Makefiles always use tabs for indentation
[Makefile]
indent_style = tab

# Trailing spaces have meaning in Markdown
[*.md]
trim_trailing_whitespace = false
[script/*]
indent_size = 2
max_line_length = 80
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Trailing spaces may be intentional in markdown documents, so these should not
# be removed.
# https://gist.github.com/shaunlebron/746476e6e7a4d698b373
**/*.md whitespace=-blank-at-eol
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
---
version: 2
updates:
Expand Down
12 changes: 0 additions & 12 deletions .github/event.json

This file was deleted.

21 changes: 5 additions & 16 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,32 @@
#
# .github/workflows/build-test.yml
#
# https://docs.github.com/en/actions/reference/environment-variables#default-environment-variables
---
name: Build, Test, and Lint

on:
pull_request:
branches: [main]
push:
branches: [main]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
group: ${{github.workflow}}-${{github.ref}}
cancel-in-progress: true

jobs:
build-test:
name: Build, Test, and Lint

# https://github.com/actions/runner-images#available-images
runs-on: macos-15

defaults:
run:
# Prefixes all `run` commands with the following command to force them to run outside Rosetta.
# https://github.com/actions/runner/issues/805#issuecomment-942784948
# https://github.com/rolpdog/cffi-mirror/blob/release-1.15/.github/workflows/ci.yaml#L81-L141
# https://github.com/actions/virtual-environments/issues/2187#issuecomment-790507204
shell: arch -arm64 bash --noprofile --norc -eo pipefail {0}

# Force all run commands to not use Rosetta 2
shell: arch -arm64 /bin/zsh -Negku {0}
steps:
- uses: actions/checkout@v4
with:
# A fetch-depth of 0 includes all history and tags for script/version
# Include all history & tags for script/version
fetch-depth: 0

- name: Bootstrap
run: script/bootstrap -f
run: script/bootstrap

- name: Build
run: script/build
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/danger.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# .github/workflows/danger.yml
#
# https://docs.github.com/en/actions/reference/environment-variables#default-environment-variables
---
name: danger
on:
Expand All @@ -11,11 +10,12 @@ jobs:
danger:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Checkout
uses: actions/checkout@v4

- name: Danger
# https://github.com/orgs/danger/packages/container/package/danger-swift
uses: docker://ghcr.io/danger/danger-swift:3.18.0
uses: docker://ghcr.io/danger/danger-swift:3.20.2
with:
args: --failOnErrors --no-publish-check
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
39 changes: 39 additions & 0 deletions .github/workflows/release-published.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#
# .github/workflows/release-published.yml
#
---
name: release-published
on:
release:
types: [published]
defaults:
run:
# Force all run commands to not use Rosetta 2
shell: arch -arm64 /bin/zsh -Negku {0}
jobs:
release-published:
if: ${{!github.event.repository.fork}}
runs-on: macos-15
steps:
- name: 🚰 Apply pr-pull label to custom tap formula bump PR
env:
GH_TOKEN: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}}
run: |
gh release -R "${GITHUB_REPOSITORY}" download "${GITHUB_REF_NAME}" -p bump.url
gh pr edit "$(<bump.url)" --add-label pr-pull
gh release -R "${GITHUB_REPOSITORY}" delete-asset "${GITHUB_REF_NAME}" bump.url -y
- name: 🍺 Bump homebrew-core formula
if: ${{!github.event.release.prerelease}}
env:
HOMEBREW_GITHUB_API_TOKEN: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}}
run: |
brew bump-formula-pr\
--tag "${GITHUB_REF_NAME}"\
--revision "${GITHUB_SHA}"\
--fork-org "${GITHUB_REPOSITORY_OWNER}"\
--no-browse\
--online\
--strict\
--verbose\
mas
Loading

0 comments on commit c8dc938

Please sign in to comment.