Skip to content

Commit 8eb6114

Browse files
authored
Merge pull request #1071 from UC-Davis-molecular-computing/dev
Dev
2 parents 541f8cb + 0c5372a commit 8eb6114

73 files changed

Lines changed: 11158 additions & 778 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: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"permissions": {
3+
"allow": [
4+
"Bash(grep:*)",
5+
"Bash(dart pub:*)",
6+
"Bash(dart analyze:*)",
7+
"Bash(dart format:*)",
8+
"Bash(dart:*)",
9+
"Bash(scoop update:*)",
10+
"Bash(scoop info:*)",
11+
"Bash(taskkill:*)",
12+
"Bash(TASKKILL:*)",
13+
"Bash(Stop-Process -Name \"dart\" -Force)",
14+
"Bash(Stop-Process -Name \"dartaotruntime\" -Force)",
15+
"WebFetch(domain:github.com)",
16+
"Bash(dart run build_runner build:*)",
17+
"Bash(python:*)",
18+
"WebFetch(domain:raw.githubusercontent.com)",
19+
"WebFetch(domain:pub.dev)",
20+
"WebSearch",
21+
"Bash(scoop install:*)",
22+
"Bash(scoop uninstall:*)",
23+
"Bash(powershell:*)",
24+
"Bash(conda init:*)"
25+
],
26+
"deny": [],
27+
"ask": [],
28+
"defaultMode": "acceptEdits"
29+
}
30+
}

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,9 @@ updates:
55
target-branch: "dev"
66
schedule:
77
interval: "weekly" # daily, weekly, monthly
8+
9+
- package-ecosystem: "npm"
10+
directory: "/standalone" # Directory of package.json
11+
target-branch: "dev"
12+
schedule:
13+
interval: "weekly"

.github/workflows/dart.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Dart SDK # Using Dart 3.8 to match pubspec.yaml constraint
1717
uses: dart-lang/setup-dart@v1 # https://github.com/dart-lang/setup-dart
1818
with:
19-
sdk: 3.8
19+
sdk: 3.9
2020

2121
- name: Install dependencies
2222
run: dart pub get

.github/workflows/dart_formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Dart SDK # Using Dart 3.8 to match pubspec.yaml constraint
1717
uses: dart-lang/setup-dart@v1 # https://github.com/dart-lang/setup-dart
1818
with:
19-
sdk: 3.8
19+
sdk: 3.9
2020

2121
- name: Install dependencies
2222
run: dart pub get

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup Dart SDK # Using Dart 3.8 to match pubspec.yaml constraint
2424
uses: dart-lang/setup-dart@v1 # https://github.com/dart-lang/setup-dart
2525
with:
26-
sdk: 3.8
26+
sdk: 3.9
2727

2828
- name: Install dependencies
2929
run: dart pub get

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup Dart SDK # Using Dart 3.8 to match pubspec.yaml constraint
2323
uses: dart-lang/setup-dart@v1 # https://github.com/dart-lang/setup-dart
2424
with:
25-
sdk: 3.8
25+
sdk: 3.9
2626

2727
- name: Install dependencies
2828
run: dart pub get
Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
name: "release"
2+
3+
on:
4+
push:
5+
branches:
6+
- "main"
7+
8+
jobs:
9+
create-release:
10+
name: "Release"
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
# ...
15+
- name: "Build & test"
16+
run: |
17+
echo "done!"
18+
- uses: "marvinpinto/action-automatic-releases@v1.2.1"
19+
env:
20+
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
21+
with:
22+
repo_token: "${{ secrets.GITHUB_TOKEN }}"
23+
automatic_release_tag: "latest"
24+
prerelease: false
25+
title: "Development Build [TODO: Replace label and title with version number]"
26+
files: |
27+
LICENSE.txt
28+
29+
upload-artifacts:
30+
name: Build on ${{ matrix.os }}
31+
needs: [ create-release ]
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
os: [ubuntu-latest, windows-latest, macos-latest]
36+
include:
37+
- os: ubuntu-latest
38+
npm_command: npm run build:lin
39+
- os: windows-latest
40+
npm_command: npm run build:win
41+
- os: macos-latest
42+
npm_command: npm run build:mac
43+
44+
runs-on: ${{ matrix.os }}
45+
steps:
46+
# 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
52+
53+
- name: Install ImageMagick
54+
shell: bash
55+
run: |
56+
if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then
57+
sudo apt-get update && sudo apt-get install -y imagemagick libfuse2
58+
elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then
59+
brew install imagemagick
60+
elif [[ "${{ matrix.os }}" == "windows-latest" ]]; then
61+
choco install imagemagick -y
62+
fi
63+
64+
- name: Install NodeJS Dependencies
65+
working-directory: ./standalone
66+
run: npm install
67+
68+
- name: Generate Icons
69+
working-directory: ./standalone
70+
shell: bash
71+
run: |
72+
chmod +x ./generate-icons.sh
73+
./generate-icons.sh ../web/images/origami-icon-thin-seam.png
74+
75+
- name: Run build
76+
working-directory: ./standalone
77+
run: ${{ matrix.npm_command }}
78+
79+
# Upload the generated artifacts (pattern: scadnano*.<ext>)
80+
- name: Upload Build Artifact
81+
uses: actions/upload-artifact@v4
82+
with:
83+
name: build-${{ matrix.os }}
84+
path: |
85+
standalone/dist/scadnano*.*
86+
!standalone/dist/*.blockmap
87+
88+
attach-to-release:
89+
name: Attach artifacts to release
90+
runs-on: ubuntu-latest
91+
needs: [upload-artifacts, create-release]
92+
93+
steps:
94+
- name: Download all artifacts
95+
uses: actions/download-artifact@v4
96+
with:
97+
path: ./release-files
98+
99+
- name: Upload to GitHub Release
100+
uses: softprops/action-gh-release@v1
101+
with:
102+
tag_name: latest
103+
files: |
104+
./release-files/**/scadnano*.*
105+
!./release-files/**/*.blockmap
106+
env:
107+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ build/
1313
.vscode/
1414

1515
node_modules/
16-
package-lock.json
1716

1817
# Directory created by dartdoc
1918
doc/api/

CLAUDE.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Please read CONTRIBUTING.md for details about this project.
2+
3+
## Important notes
4+
5+
- **`.g.dart` files are auto-generated** by the `built_value` code generator and should generally NOT be read
6+
or modified by hand. They are regenerated by running `dart run build_runner build` (or automatically when
7+
using `webdev serve`). If you need to understand a built_value class, read only the corresponding `.dart`
8+
source file (e.g., read `app_ui_state_storables.dart`, not `app_ui_state_storables.g.dart`).

0 commit comments

Comments
 (0)