Skip to content

Commit 098d07d

Browse files
reid-spencerclaude
andcommitted
Fix CI workflows for Scala 3.8.3 upgrade
Update all workflow paths from scala-3.7.4 to scala-3.8.3 in release.yml, scala.yml, and coverage.yml. Add context-types.riddl to EBNF include fragment exclusion lists. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 9927e5e commit 098d07d

5 files changed

Lines changed: 13 additions & 11 deletions

File tree

.github/workflows/coverage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ jobs:
5959
name: code-coverage-report
6060
retention-days: 30
6161
path: |
62-
**/jvm/target/scala-3.7.4/scoverage-report/scoverage.xml
63-
**/target/scala-3.7.4/scoverage-report/scoverage.xml
64-
target/scala-3.7.4/scoverage-report/scoverage.xml
62+
**/jvm/target/scala-3.8.3/scoverage-report/scoverage.xml
63+
**/target/scala-3.8.3/scoverage-report/scoverage.xml
64+
target/scala-3.8.3/scoverage-report/scoverage.xml

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
- name: Package Native Binary
7878
run: |
7979
mkdir -p staging/bin
80-
cp riddlc/native/target/scala-3.7.4/riddlc staging/bin/riddlc
80+
cp riddlc/native/target/scala-3.8.3/riddlc staging/bin/riddlc
8181
cd staging && zip -r ../${{ matrix.artifact }}.zip bin/
8282
8383
- name: Upload to Release

.github/workflows/scala.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
packages: read
1919
env:
2020
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21-
RIDDLC_PATH: riddlc/native/target/scala-3.7.4/riddlc
21+
RIDDLC_PATH: riddlc/native/target/scala-3.8.3/riddlc
2222
runs-on: ubuntu-latest
2323
strategy:
2424
fail-fast: false
@@ -57,9 +57,9 @@ jobs:
5757
uses: actions/cache@v4
5858
with:
5959
path: |
60-
**/target/scala-3.7.4
61-
!**/target/scala-3.7.4/src_managed
62-
!**/target/scala-3.7.4/resource_managed
60+
**/target/scala-3.8.3
61+
!**/target/scala-3.8.3/src_managed
62+
!**/target/scala-3.8.3/resource_managed
6363
key: ${{ runner.os }}-sbt-build-${{ matrix.platform }}-${{ hashFiles('**/*.sbt', 'project/**') }}
6464
restore-keys: |
6565
${{ runner.os }}-sbt-build-${{ matrix.platform }}-
@@ -138,8 +138,8 @@ jobs:
138138
name: collect-release-artifacts-native
139139
retention-days: 30
140140
path: |
141-
riddlc/native/target/scala-3.7.4/riddlc
142-
riddlLib/native/target/scala-3.7.4/libriddl-lib.a
141+
riddlc/native/target/scala-3.8.3/riddlc
142+
riddlLib/native/target/scala-3.8.3/libriddl-lib.a
143143
144144
- name: Collect Release Artifacts (JS)
145145
if: matrix.platform == 'JS'
@@ -148,7 +148,7 @@ jobs:
148148
name: collect-release-artifacts-js
149149
retention-days: 30
150150
path: |
151-
riddlLib/js/target/scala-3.7.4/riddl-lib-opt/main.js
151+
riddlLib/js/target/scala-3.8.3/riddl-lib-opt/main.js
152152
riddlLib/js/types/index.d.ts
153153
154154
- name: Cleanup Before Caching

language/jvm/src/test/python/ebnf_tatsu_validator.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"context.riddl", # Context fragment in full/
5151
"588included.riddl", # Fragment included by 588.riddl
5252
"foo.riddl", # Fragment in issues/584/Foo/
53+
"context-types.riddl", # Context-level types for id-in-include test
5354
}
5455

5556
# Files that are intentionally invalid for testing error handling.

language/jvm/src/test/python/ebnf_validator.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"page.riddl", # Group definitions fragment
4444
"application.riddl", # Context fragment in full/ and includes/
4545
"context.riddl", # Context fragment in full/
46+
"context-types.riddl", # Context-level types for id-in-include test
4647
}
4748

4849
# Files that are intentionally invalid for testing error handling

0 commit comments

Comments
 (0)