Skip to content

Commit a684fde

Browse files
authored
Merge branch 'chipsalliance:main' into tywaves-annotations
2 parents 91108bf + c1ad4e4 commit a684fde

File tree

153 files changed

+5806
-1766
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+5806
-1766
lines changed

.github/workflows/backport-fixup.yml

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Fixes up Mergify-created backport PRs to include necessary labels and other
2-
# information for release notes generation
2+
# information for release notes generation.
3+
# This action formerly copied over the PR body but it seems Mergify does that
4+
# itself now.
35

46
name: Backport Fixup
57

@@ -26,7 +28,7 @@ jobs:
2628
original_pr: ${{ steps.original.outputs.pr }}
2729

2830
steps:
29-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3032
- name: Figure out backport PR number
3133
id: backport
3234
run: |
@@ -55,7 +57,7 @@ jobs:
5557
if: ${{ needs.resolve_prs.outputs.original_pr }}
5658

5759
steps:
58-
- uses: actions/checkout@v3
60+
- uses: actions/checkout@v4
5961
- name: Copy over labels
6062
env:
6163
GH_TOKEN: ${{ github.token }}
@@ -66,25 +68,3 @@ jobs:
6668
# Long line but the paste joining must be done right away or we run into issues with spaces in labels
6769
LABELS=$(gh pr view --json labels --jq '.labels | .[].name | select(. != "Backported")' $ORIG_PR | paste -sd "," -)
6870
gh pr edit $BP_PR --add-label "$LABELS"
69-
- name: Copy over body
70-
env:
71-
GH_TOKEN: ${{ github.token }}
72-
run: |
73-
BP_PR=${{ needs.resolve_prs.outputs.backport_pr }}
74-
ORIG_PR=${{ needs.resolve_prs.outputs.original_pr }}
75-
76-
gh pr view --json body --jq '.body' $ORIG_PR > orig_body.txt
77-
gh pr view --json body --jq '.body' $BP_PR > bp_body.txt
78-
79-
if grep -q '# Original PR Body' bp_body.txt; then
80-
# Copy BP PR body but remove original PR body from bottom
81-
sed '/# Original PR Body/q' bp_body.txt > new_bp_body.txt
82-
echo "" >> new_bp_body.txt
83-
else
84-
cp bp_body.txt new_bp_body.txt
85-
echo -e "\n----\n\n# Original PR Body\n" >> new_bp_body.txt
86-
fi
87-
88-
cat orig_body.txt >> new_bp_body.txt
89-
90-
gh pr edit $BP_PR --body-file new_bp_body.txt

.github/workflows/build-scala-cli-example.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
# Need to fetch full history for deriving version
1919
with:
2020
fetch-depth: 0
@@ -57,7 +57,7 @@ jobs:
5757
shell: bash
5858
run: scala-cli chisel-example.scala
5959
- name: Upload Example
60-
uses: actions/upload-artifact@v3
60+
uses: actions/upload-artifact@v4
6161
with:
6262
name: chisel-example.scala
6363
path: chisel-example.scala

.github/workflows/build-scala-cli-example/chisel-example.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//> using repository "sonatype-s01:snapshots"
2-
//> using scala "2.13.12"
2+
//> using scala "2.13.14"
33
//> using dep "org.chipsalliance::chisel:@VERSION@"
44
//> using plugin "org.chipsalliance:::chisel-plugin:@VERSION@"
55
//> using options "-unchecked", "-deprecation", "-language:reflectiveCalls", "-feature", "-Xcheckinit", "-Xfatal-warnings", "-Ywarn-dead-code", "-Ywarn-unused", "-Ymacro-annotations"

.github/workflows/ci-circt-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
matrix:
4747
system: ["ubuntu-22.04"]
4848
jvm: [8]
49-
scala: ["2.13.12"]
49+
scala: ["2.13.14"]
5050
espresso: ["2.4"]
5151
circt: ["nightly"]
5252
ref: ${{ fromJSON(needs.determine-branch.outputs.branches) }}

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
matrix:
2020
system: ["ubuntu-22.04"]
2121
jvm: [8]
22-
scala: ["2.13.12"]
22+
scala: ["2.13.14"]
2323
espresso: ["2.4"]
2424
uses: ./.github/workflows/test.yml
2525
with:
@@ -73,7 +73,7 @@ jobs:
7373

7474
steps:
7575
- name: Checkout
76-
uses: actions/checkout@v3
76+
uses: actions/checkout@v4
7777
with:
7878
fetch-depth: 0
7979
- name: Cache Scala
@@ -105,13 +105,13 @@ jobs:
105105
if: (github.event_name == 'push') && (github.ref_name == 'main')
106106
steps:
107107
- name: Download built website
108-
uses: actions/download-artifact@v3
108+
uses: actions/download-artifact@v4
109109
with:
110110
name: website
111111
- name: Untar built website
112112
run: tar zxf website.tar.gz
113113
- name: Deploy Website to GitHub Pages (From Main Branch)
114-
uses: peaceiris/actions-gh-pages@v3
114+
uses: peaceiris/actions-gh-pages@v4
115115
with:
116116
github_token: ${{ secrets.GITHUB_TOKEN }}
117117
publish_dir: website/build

.github/workflows/enable-bincompat-checking.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
branches: ${{ steps.determine-branches.outputs.branches }}
3838

3939
steps:
40-
- uses: actions/checkout@v3
40+
- uses: actions/checkout@v4
4141
with:
4242
fetch-depth: 0
4343
- name: Check Valid
@@ -70,14 +70,14 @@ jobs:
7070
branch: ${{ fromJson(needs.determine_branches.outputs.branches) }}
7171

7272
steps:
73-
- uses: actions/checkout@v3
73+
- uses: actions/checkout@v4
7474
- name: Create file
7575
run: |
7676
VERSION=${{ needs.determine_version.outputs.version }}
7777
VERSION_NO_V=${VERSION#v}
7878
echo $VERSION_NO_V >> project/previous-versions.txt
7979
- name: Open PR
80-
uses: peter-evans/create-pull-request@v5
80+
uses: peter-evans/create-pull-request@v6
8181
with:
8282
base: ${{ matrix.branch }}
8383
branch: bincompat/${{ matrix.branch }}/${{ needs.determine_version.outputs.version }}

.github/workflows/install-espresso/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runs:
1010
using: composite
1111
steps:
1212
- id: cache-espresso
13-
uses: actions/cache@v3
13+
uses: actions/cache@v4
1414
with:
1515
path: /usr/local/bin/espresso
1616
key: espresso-${{ runner.os }}-${{ inputs.version }}

.github/workflows/install-jextract/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runs:
1010
using: composite
1111
steps:
1212
- id: cache-jextract
13-
uses: actions/cache@v3
13+
uses: actions/cache@v4
1414
with:
1515
path: jextract
1616
key: jextract-${{ runner.os }}-${{ inputs.file-name }}

.github/workflows/release-notes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: echo "$CHANGELOG" >> $GITHUB_STEP_SUMMARY
4242
- name: Upload Release Notes (on release)
4343
if: github.event_name == 'release'
44-
uses: softprops/action-gh-release@v0.1.15
44+
uses: softprops/action-gh-release@v2.0.5
4545
with:
4646
body: ${{ steps.release-notes.outputs.changelog }}
4747
- name: Error on uncategorized PRs

.github/workflows/require-label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Check Labels
1717
runs-on: ubuntu-22.04
1818
steps:
19-
- uses: docker://agilepathway/pull-request-label-checker:v1.4.25
19+
- uses: docker://agilepathway/pull-request-label-checker:v1.6.32
2020
with:
2121
one_of: Feature,Performance,API Modification,Deprecation,Backend Code Generation,Bugfix,Documentation,Dependency Update,Internal,No Release Notes
2222
repo_token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)