Skip to content

Harden CI and modernize pnpm toolchain (corepack + pnpm 11) #733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stabbylambda wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Harden CI and modernize pnpm toolchain (corepack + pnpm 11) #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
806d6e0
chore(pnpm): switch to corepack and pin pnpm 11.5.2
stabbylambda Jun 8, 2026
17cfcfd
ci: harden workflows with SHA-pinned actions, concurrency, and timeouts
stabbylambda Jun 8, 2026
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
9 changes: 5 additions & 4 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,21 @@ concurrency:
jobs:
run-cdk-deploy:
runs-on: ubuntu-latest
timeout-minutes: 30

defaults:
run:
shell: devenv shell bash -- -e {0}

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3

- name: Install Nix
uses: cachix/install-nix-action@v31
uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6

- name: Set up devenv cache
uses: cachix/cachix-action@v16
uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
with:
name: devenv

Expand All @@ -38,7 +39,7 @@ jobs:
run: nix profile add nixpkgs#devenv

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v6
uses: aws-actions/configure-aws-credentials@e7f100cf4c008499ea8adda475de1042d6975c7b # v6.2.0
with:
role-to-assume: ${{ secrets.ASSUME_ROLE }}
aws-region: us-west-2
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,28 @@ on:
env:
CARGO_TERM_COLOR: always

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 30

defaults:
run:
shell: devenv shell bash -- -e {0}

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3

- name: Install Nix
uses: cachix/install-nix-action@v31
uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6

- name: Set up devenv cache
uses: cachix/cachix-action@v16
uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
with:
name: devenv

Expand Down
2 changes: 1 addition & 1 deletion devenv.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

languages.javascript.enable = true;
languages.javascript.package = pkgs.nodejs_24;
languages.javascript.pnpm.enable = true;
languages.javascript.corepack.enable = true;

packages = [
pkgs.rustup # not actually using rustup, but the cdk builder expects it
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"private": true,
"version": "1.0.0",
"description": "",
"packageManager": "pnpm@11.5.2",
"scripts": {
"deploy": "pnpm --filter trashcal-cdk run deploy",
"smoke": "pnpm --filter trashcal-cdk run smoke"
Expand Down
Loading