Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 2 additions & 2 deletions .github/actions/cargo-cache/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ runs:
steps:
# https://doc.rust-lang.org/1.77.2/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci
- name: Cargo cache (home)
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: |-
/home/runner/.cargo/.crates.toml
Expand All @@ -33,7 +33,7 @@ runs:
cargo-home-${{ inputs.key }}-

- name: Cargo cache (build)
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ${{ inputs.targets }}
key: cargo-target-${{ inputs.key }}-${{ runner.os }}-${{ hashFiles(inputs.lockfiles) }}
Expand Down
46 changes: 13 additions & 33 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,14 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Install Node.js
uses: actions/setup-node@v4
- name: Install pnpm and node
uses: pnpm/setup@v2
with:
node-version: 20

- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9
run_install: false

- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV

- name: Setup pnpm cache
uses: actions/cache@v4
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-

- name: Install JS dependencies
run: pnpm install
version: ^11
runtime: node@26
cache: true

- name: Format UI assets
run: pnpm fmt:check
Expand All @@ -57,7 +37,7 @@ jobs:
run: cargo xtask assets

- name: Upload assets
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: assets
path: src/html/assets.rs
Expand All @@ -77,10 +57,10 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Download assets
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: assets
path: src/html
Expand All @@ -99,7 +79,7 @@ jobs:
run: cargo build

- name: Upload binary
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: binary-${{ matrix.rust }}
path: target/debug/margo
Expand All @@ -112,10 +92,10 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Download assets
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: assets
path: src/html
Expand All @@ -138,7 +118,7 @@ jobs:
conformance/target

- name: Download binary
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: binary-stable
path: .
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Build code
run: cargo build --release

- name: Save binary artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: binary-linux
path: target/release/margo
Expand All @@ -26,7 +26,7 @@ jobs:
run: cargo package

- name: Save package artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: package
path: target/package/margo-*.crate
Expand All @@ -36,13 +36,13 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Build code
run: cargo build --release

- name: Save binary artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: binary-windows
path: target/release/margo.exe
Expand All @@ -52,13 +52,13 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Build code
run: cargo build --release

- name: Save binary artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: binary-macos-aarch64
path: target/release/margo
Expand All @@ -69,27 +69,27 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Determine tag
run: |
tag=$(echo ${{github.event.ref}} | cut -d/ -f3)
echo "tag=${tag}" >> $GITHUB_ENV

- name: Download binary artifacts (Linux)
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: binary-linux
path: linux

- name: Download binary artifacts (Windows)
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: binary-windows
path: windows

- name: Download binary artifacts (macOS)
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: binary-macos-aarch64
path: macos-aarch64
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:

steps:
- name: Checkout GitHub Pages
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
ref: gh-pages

Expand All @@ -128,7 +128,7 @@ jobs:
echo "tag=${tag}" >> $GITHUB_ENV

- name: Download package artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: package
path: package
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
conformance
pnpm-lock.yaml
pnpm-workspace.yaml
tsconfig.json
Loading