Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .github/workflows/deno-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Deno using local-setup script
run: |
source deno/local-setup.sh
# Make sure .local/bin is added to PATH for subsequent steps
echo "$PWD/.local/bin" >> $GITHUB_PATH
deno --version
- name: Setup tools using proto
uses: moonrepo/setup-toolchain@v0
with:
auto-install: true

- name: Check formatting
working-directory: ./deno
Expand All @@ -30,4 +28,4 @@ jobs:

- name: Check types
working-directory: ./deno
run: deno check local-setup.ts genadl.ts
run: deno check genadl.ts
10 changes: 4 additions & 6 deletions .github/workflows/ts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Setup pnpm using local-setup script
run: |
source deno/local-setup.sh
# Make sure .local/bin is added to PATH for subsequent steps
echo "$PWD/.local/bin" >> $GITHUB_PATH
deno --version
- name: Setup tools using proto
uses: moonrepo/setup-toolchain@v0
with:
auto-install: true

- name: Install deps
working-directory: ./ts
Expand Down
7 changes: 7 additions & 0 deletions .prototools
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
node = "20.7.0"
pnpm = "10.6.5"
deno = "2.2.5"
adlc = "1.3.0"

[plugins]
adlc = "file://proto/adlc.toml"
5 changes: 0 additions & 5 deletions .vscode/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,3 @@ fi

# Keep history in the normal location
export HISTFILE="$HOME/.zsh_history"

# Source the local setup script
if [ -f "$PWD/deno/local-setup.sh" ]; then
. "$PWD/deno/local-setup.sh"
fi
15 changes: 1 addition & 14 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,5 @@
"deno.enablePaths": ["deno"],
"deno.path": "./.local/bin/deno",
"deno.importMap": "./deno.json",
"typescript.preferences.importModuleSpecifier": "non-relative",
"terminal.integrated.profiles.osx": {
"zsh (local-setup)": {
"path": "zsh",
"args": ["-i"],
"env": {
"ZDOTDIR": "${workspaceFolder}/.vscode",
"ZSH_COMPDUMP": "${workspaceFolder}/.vscode/.zshcompdump",
},
"icon": "terminal-bash"
}
},
"terminal.integrated.defaultProfile.osx": "zsh (local-setup)",
"terminal.integrated.shellIntegration.enabled": true
"typescript.preferences.importModuleSpecifier": "non-relative"
}
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,12 @@ current user are shown.

Currently linux and macos are supported.

Install docker and rust/cargo for your platform. Then install deno, node, pnpm, and adl into a repo
local directory by sourcing the local setup script:
Install docker and rust/cargo for your platform. Then install the appropriate versions of deno, node, pnpm, and
adl locally using the [proto](https://moonrepo.dev/proto) tool.

```bash
. deno/local-setup.sh
```
cd <repo root>
proto install
```

Check installed tool versions with:
Expand Down Expand Up @@ -173,7 +174,6 @@ cargo run --bin protoapp-tools -- create-user --is-admin sarah@test.com Sarah ab
```bash
(
cd ts/ui
# note pnpm is installed by local-setup.sh
pnpm install
pnpm run dev
)
Expand All @@ -183,7 +183,6 @@ pnpm run dev
```bash
(
cd ts/api-workbench
# note pnpm is installed by local-setup.sh
pnpm install
pnpm run dev
)
Expand Down
1 change: 0 additions & 1 deletion deno.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"build-ui-image": "cd ts/ui && docker build --file Dockerfile --tag protoapp-ui:latest .."
},
"imports": {
"@adllang/local-setup": "jsr:@adllang/local-setup@^0.16.0",
"@adllang/adl-runtime": "jsr:@adllang/adl-runtime@^0.1.0",
"@adllang/adlc-tools": "jsr:@adllang/adlc-tools@^0.2.2",
"@mesqueeb/case-anything": "jsr:@mesqueeb/case-anything@^3.1.0",
Expand Down
10 changes: 0 additions & 10 deletions deno/deno.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 0 additions & 55 deletions deno/local-setup.sh

This file was deleted.

37 changes: 0 additions & 37 deletions deno/local-setup.ts

This file was deleted.

20 changes: 20 additions & 0 deletions proto/adlc.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name = "adlc"
type = "cli"

[resolve]
git-url = "https://github.com/adl-lang/adl"

[platform.linux]
exe-path = "bin/adlc"
download-file = "adl-bindist-{version}-linux-{arch}.zip"

[platform.macos]
exe-path = "bin/adlc"
download-file = "adl-bindist-{version}-macos-{arch}.zip"

[install]
download-url = "https://github.com/adl-lang/adl/releases/download/v{version}/{download_file}"

[install.arch]
aarch64 = "arm64"
x86_64 = "x64"