diff --git a/.woodpecker.yml b/.woodpecker.yml index 34be556..0cefeec 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,19 +1,15 @@ steps: build: - image: node:20 + # image: node:20 + image: oven/bun:1 commands: - - npm install -g pnpm - # - cd /tmp - # - rm -rf astro - # - git clone https://git.mzhang.io/michael/astro --depth 1 - # - cd astro - # - pnpm install - # - pnpm run build - # - cd /woodpecker/src/git.mzhang.io/michael/blog - - pnpm install - # - pnpm link /tmp/astro/packages/astro - # - pnpm link /tmp/astro/packages/markdown/remark - - pnpm run build + # - npm install -g pnpm + # - pnpm install + # - pnpm run build + - bun install --frozen-lockfile + - bun run build + when: + - event: push deploy: image: alpine @@ -26,4 +22,5 @@ steps: - rsync -azrP -e "ssh -i SSH_SECRET_KEY" dist/ blogDeploy@mzhang.io:/home/blogDeploy/public secrets: [SSH_SECRET_KEY] when: - branch: master + - branch: master + event: push diff --git a/bun.lockb b/bun.lockb new file mode 100755 index 0000000..e755160 Binary files /dev/null and b/bun.lockb differ diff --git a/docker/builder.nix b/docker/builder.nix new file mode 100644 index 0000000..97b0a8a --- /dev/null +++ b/docker/builder.nix @@ -0,0 +1,12 @@ +{ pkgs ? import { } +}: + + +pkgs.dockerTools.buildImage { + name = "hello-docker"; + config = { + Cmd = [ "${pkgs.hello}/bin/hello" ]; + Env = [ + "PATH=${pkgs.agda.withPackages (p: with p; { standard-library })}" ]; + }; +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..0b5f22b --- /dev/null +++ b/flake.nix @@ -0,0 +1,10 @@ +{ + outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { inherit system; }; + flakePkgs = { builder = pkgs.callPackage ./docker/builder.nix { }; }; + in + { + packages = flake-utils.lib.flattenTree flakePkgs; + }); +} diff --git a/package.json b/package.json index d094b25..d90e78c 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "prettier-plugin-astro": "^0.12.0", "rehype-slug": "^6.0.0", "sass": "^1.66.1", - "sharp": "^0.32.6", + "sharp": "^0.33.4", "shiki": "^0.14.5", "unified": "^11.0.2", "unist-util-visit": "^5.0.0"