Skip to content

Commit

Permalink
Merge branch 'master' into yash/fix-8840
Browse files Browse the repository at this point in the history
  • Loading branch information
yash-atreya authored Dec 20, 2024
2 parents 860ff71 + 5a8bd89 commit 54be7b9
Show file tree
Hide file tree
Showing 33 changed files with 1,126 additions and 425 deletions.
64 changes: 57 additions & 7 deletions .github/changelog.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,66 @@
{
"categories": [
{
"title": "## Features",
"labels": ["T-feature"]
"title": "## Breaking changes",
"labels": ["T-likely-breaking "]
},
{
"title": "## Fixes",
"labels": ["T-bug", "T-fix"]
"title": "## Anvil Features",
"labels": ["C-anvil", "T-feature"],
"exhaustive": true,
"exhaustive_rules": false
},
{
"title": "## Anvil Fixes",
"labels": ["C-anvil", "T-bug"],
"exhaustive": true,
"exhaustive_rules": false
},
{
"title": "## Cast Features",
"labels": ["C-cast", "T-feature"],
"exhaustive": true,
"exhaustive_rules": false
},
{
"title": "## Cast Fixes",
"labels": ["C-cast", "T-bug"],
"exhaustive": true,
"exhaustive_rules": false
},
{
"title": "## Chisel Features",
"labels": ["C-chisel", "T-feature"],
"exhaustive": true,
"exhaustive_rules": false
},
{
"title": "## Chisel Fixes",
"labels": ["C-chisel", "T-bug"],
"exhaustive": true,
"exhaustive_rules": false
},
{
"title": "## Forge Features",
"labels": ["C-forge", "T-feature"],
"exhaustive": true,
"exhaustive_rules": false
},
{
"title": "## Forge Fixes",
"labels": ["C-forge", "T-bug"],
"exhaustive": true,
"exhaustive_rules": false
},
{
"title": "## Performance improvements",
"labels": ["T-perf"]
}
],
"ignore_labels": ["L-ignore"],
"template": "${{CHANGELOG}}\n## Other\n\n${{UNCATEGORIZED}}",
"pr_template": "- ${{TITLE}} (#${{NUMBER}})",
"empty_template": "- No changes"
"template": "${{CHANGELOG}}\n## Other\n\n${{UNCATEGORIZED}}\n## Full Changelog:\n ${{RELEASE_DIFF}}",
"pr_template": "- ${{TITLE}} (#${{NUMBER}}) by @${{AUTHOR}}",
"empty_template": "- No changes",
"max_pull_requests": 100,
"max_back_track_time_days": 60
}
17 changes: 9 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: release
on:
push:
tags:
- "stable"
- "v*.*.*"
schedule:
- cron: "0 0 * * *"
Expand Down Expand Up @@ -30,7 +31,7 @@ jobs:
- name: Compute release name and tag
id: release_info
run: |
if [[ $IS_NIGHTLY ]]; then
if [[ ${IS_NIGHTLY} == 'true' ]]; then
echo "tag_name=nightly-${GITHUB_SHA}" >> $GITHUB_OUTPUT
echo "release_name=Nightly ($(date '+%Y-%m-%d'))" >> $GITHUB_OUTPUT
else
Expand All @@ -43,7 +44,7 @@ jobs:
# which allows users to roll back. It is also used to build
# the changelog.
- name: Create build-specific nightly tag
if: ${{ env.IS_NIGHTLY }}
if: ${{ env.IS_NIGHTLY == 'true' }}
uses: actions/github-script@v7
env:
TAG_NAME: ${{ steps.release_info.outputs.tag_name }}
Expand All @@ -57,7 +58,7 @@ jobs:
uses: mikepenz/release-changelog-builder-action@v4
with:
configuration: "./.github/changelog.json"
fromTag: ${{ env.IS_NIGHTLY && 'nightly' || '' }}
fromTag: ${{ env.IS_NIGHTLY == 'true' && 'nightly' || '' }}
toTag: ${{ steps.release_info.outputs.tag_name }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -168,7 +169,7 @@ jobs:
env:
PLATFORM_NAME: ${{ matrix.platform }}
OUT_DIR: target/${{ matrix.target }}/${{ env.PROFILE }}
VERSION_NAME: ${{ (env.IS_NIGHTLY && 'nightly') || needs.prepare.outputs.tag_name }}
VERSION_NAME: ${{ (env.IS_NIGHTLY == 'true' && 'nightly') || needs.prepare.outputs.tag_name }}
ARCH: ${{ matrix.arch }}
shell: bash
run: |
Expand All @@ -192,7 +193,7 @@ jobs:
if: matrix.target == 'x86_64-unknown-linux-gnu'
env:
OUT_DIR: target/${{ matrix.target }}/${{ env.PROFILE }}
VERSION_NAME: ${{ (env.IS_NIGHTLY && 'nightly') || needs.prepare.outputs.tag_name }}
VERSION_NAME: ${{ (env.IS_NIGHTLY == 'true' && 'nightly') || needs.prepare.outputs.tag_name }}
shell: bash
run: |
sudo apt-get -y install help2man
Expand All @@ -213,7 +214,7 @@ jobs:
with:
name: ${{ needs.prepare.outputs.release_name }}
tag_name: ${{ needs.prepare.outputs.tag_name }}
prerelease: ${{ env.IS_NIGHTLY }}
prerelease: ${{ env.IS_NIGHTLY == 'true' }}
body: ${{ needs.prepare.outputs.changelog }}
files: |
${{ steps.artifacts.outputs.file_name }}
Expand All @@ -231,7 +232,7 @@ jobs:
# If this is a nightly release, it also updates the release
# tagged `nightly` for compatibility with `foundryup`
- name: Update nightly release
if: ${{ env.IS_NIGHTLY }}
if: ${{ env.IS_NIGHTLY == 'true' }}
uses: softprops/action-gh-release@v2
with:
name: "Nightly"
Expand All @@ -253,7 +254,7 @@ jobs:

# Moves the `nightly` tag to `HEAD`
- name: Move nightly tag
if: ${{ env.IS_NIGHTLY }}
if: ${{ env.IS_NIGHTLY == 'true' }}
uses: actions/github-script@v7
with:
script: |
Expand Down
Loading

0 comments on commit 54be7b9

Please sign in to comment.