Skip to content

Commit 36b7e51

Browse files
authored
Merge pull request #1083 from UC-Davis-molecular-computing/dev
Dev
2 parents 8eb6114 + 6054530 commit 36b7e51

262 files changed

Lines changed: 4969 additions & 6451 deletions

File tree

Some content is hidden

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

.claude/settings.local.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"permissions": {
33
"allow": [
4+
"Bash(*)",
45
"Bash(grep:*)",
56
"Bash(dart pub:*)",
67
"Bash(dart analyze:*)",
@@ -27,4 +28,4 @@
2728
"ask": [],
2829
"defaultMode": "acceptEdits"
2930
}
30-
}
31+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Setup Dart SDK
2+
inputs:
3+
sdk:
4+
default: "3.11"
5+
description: The Dart SDK to use. Defaults to 3.11 if none is provided.
6+
runs:
7+
using: composite
8+
steps:
9+
- uses: dart-lang/setup-dart@v1
10+
with:
11+
sdk: ${{ inputs.sdk }}

.github/workflows/dart.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@ jobs:
1313
- name: Checkout branch
1414
uses: actions/checkout@v4
1515

16-
- name: Setup Dart SDK # Using Dart 3.8 to match pubspec.yaml constraint
17-
uses: dart-lang/setup-dart@v1 # https://github.com/dart-lang/setup-dart
18-
with:
19-
sdk: 3.9
16+
- name: Setup Dart SDK
17+
uses: ./.github/actions/setup-dart
2018

2119
- name: Install dependencies
2220
run: dart pub get
2321

22+
- name: Build generated files for sub-packages
23+
run: |
24+
cd scadnano_state_actions && dart run build_runner build --delete-conflicting-outputs && cd ..
25+
cd scadnano_reducers && dart run build_runner build --delete-conflicting-outputs && cd ..
26+
2427
- name: Run Tests
2528
run: dart run build_runner test
2629

.github/workflows/dart_formatting.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@ jobs:
1313
- name: Checkout branch
1414
uses: actions/checkout@v4
1515

16-
- name: Setup Dart SDK # Using Dart 3.8 to match pubspec.yaml constraint
17-
uses: dart-lang/setup-dart@v1 # https://github.com/dart-lang/setup-dart
18-
with:
19-
sdk: 3.9
16+
- name: Setup Dart SDK
17+
uses: ./.github/actions/setup-dart
2018

2119
- name: Install dependencies
2220
run: dart pub get
2321

2422
- name: Verify formatting
25-
run: dart format -l 110 --output=none --set-exit-if-changed .
23+
run: dart format -l 120 --output=none --set-exit-if-changed .
2624

2725
fail_if_pull_request_is_draft:
2826
if: github.event.pull_request.draft == true

.github/workflows/gh-pages-dev.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,17 @@ jobs:
2020
ref: gh-pages
2121
path: gh-pages-repo
2222

23-
- name: Setup Dart SDK # Using Dart 3.8 to match pubspec.yaml constraint
24-
uses: dart-lang/setup-dart@v1 # https://github.com/dart-lang/setup-dart
25-
with:
26-
sdk: 3.9
23+
- name: Setup Dart SDK
24+
uses: ./.github/actions/setup-dart
2725

2826
- name: Install dependencies
2927
run: dart pub get
3028

29+
- name: Build generated files for sub-packages
30+
run: |
31+
cd scadnano_state_actions && dart run build_runner build --delete-conflicting-outputs && cd ..
32+
cd scadnano_reducers && dart run build_runner build --delete-conflicting-outputs && cd ..
33+
3134
- name: Install webdev
3235
run: dart pub global activate webdev
3336

.github/workflows/gh-pages.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,17 @@ jobs:
1919
ref: gh-pages
2020
path: gh-pages-repo
2121

22-
- name: Setup Dart SDK # Using Dart 3.8 to match pubspec.yaml constraint
23-
uses: dart-lang/setup-dart@v1 # https://github.com/dart-lang/setup-dart
24-
with:
25-
sdk: 3.9
22+
- name: Setup Dart SDK
23+
uses: ./.github/actions/setup-dart
2624

2725
- name: Install dependencies
2826
run: dart pub get
2927

28+
- name: Build generated files for sub-packages
29+
run: |
30+
cd scadnano_state_actions && dart run build_runner build --delete-conflicting-outputs && cd ..
31+
cd scadnano_reducers && dart run build_runner build --delete-conflicting-outputs && cd ..
32+
3033
- name: Activate webdev
3134
run: dart pub global activate webdev
3235

.github/workflows/release-and-upload-artifacts.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,14 @@ jobs:
4444
runs-on: ${{ matrix.os }}
4545
steps:
4646
# Setup Builder
47-
- uses: actions/checkout@v4
48-
- uses: actions/setup-node@v4
49-
- uses: dart-lang/setup-dart@v1
50-
with:
51-
sdk: 3.8
47+
- name: Checkout Repository
48+
uses: actions/checkout@v6
49+
50+
- name: Setup Node
51+
uses: actions/setup-node@v6
52+
53+
- name: Setup Dart SDK
54+
uses: ./.github/actions/setup-dart
5255

5356
- name: Install ImageMagick
5457
shell: bash
@@ -80,6 +83,7 @@ jobs:
8083
- name: Upload Build Artifact
8184
uses: actions/upload-artifact@v4
8285
with:
86+
retention-days: 1 # reduce from 90-day default. This is only required for passing artifacts between jobs.
8387
name: build-${{ matrix.os }}
8488
path: |
8589
standalone/dist/scadnano*.*

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ codenano.html
2626

2727
todo.txt
2828

29-
todo extensions.txt
29+
todo extensions.txt
30+
31+
# Auto-generated by built_value
32+
*.g.dart

0 commit comments

Comments
 (0)