This reverts commit 435ec21f6e
.
This commit is contained in:
parent
5d631561b5
commit
0d70a68769
5 changed files with 15 additions and 34 deletions
|
@ -1,15 +1,19 @@
|
||||||
steps:
|
steps:
|
||||||
build:
|
build:
|
||||||
# image: node:20
|
image: node:20
|
||||||
image: oven/bun:1
|
|
||||||
commands:
|
commands:
|
||||||
# - npm install -g pnpm
|
- npm install -g pnpm
|
||||||
|
# - cd /tmp
|
||||||
|
# - rm -rf astro
|
||||||
|
# - git clone https://git.mzhang.io/michael/astro --depth 1
|
||||||
|
# - cd astro
|
||||||
# - pnpm install
|
# - pnpm install
|
||||||
# - pnpm run build
|
# - pnpm run build
|
||||||
- bun install --frozen-lockfile
|
# - cd /woodpecker/src/git.mzhang.io/michael/blog
|
||||||
- bun run build
|
- pnpm install
|
||||||
when:
|
# - pnpm link /tmp/astro/packages/astro
|
||||||
- event: push
|
# - pnpm link /tmp/astro/packages/markdown/remark
|
||||||
|
- pnpm run build
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
image: alpine
|
image: alpine
|
||||||
|
@ -22,5 +26,4 @@ steps:
|
||||||
- rsync -azrP -e "ssh -i SSH_SECRET_KEY" dist/ blogDeploy@mzhang.io:/home/blogDeploy/public
|
- rsync -azrP -e "ssh -i SSH_SECRET_KEY" dist/ blogDeploy@mzhang.io:/home/blogDeploy/public
|
||||||
secrets: [SSH_SECRET_KEY]
|
secrets: [SSH_SECRET_KEY]
|
||||||
when:
|
when:
|
||||||
- branch: master
|
branch: master
|
||||||
event: push
|
|
||||||
|
|
BIN
bun.lockb
BIN
bun.lockb
Binary file not shown.
|
@ -1,12 +0,0 @@
|
||||||
{ pkgs ? import <nixpkgs> { }
|
|
||||||
}:
|
|
||||||
|
|
||||||
|
|
||||||
pkgs.dockerTools.buildImage {
|
|
||||||
name = "hello-docker";
|
|
||||||
config = {
|
|
||||||
Cmd = [ "${pkgs.hello}/bin/hello" ];
|
|
||||||
Env = [
|
|
||||||
"PATH=${pkgs.agda.withPackages (p: with p; { standard-library })}" ];
|
|
||||||
};
|
|
||||||
}
|
|
10
flake.nix
10
flake.nix
|
@ -1,10 +0,0 @@
|
||||||
{
|
|
||||||
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;
|
|
||||||
});
|
|
||||||
}
|
|
|
@ -47,7 +47,7 @@
|
||||||
"prettier-plugin-astro": "^0.12.0",
|
"prettier-plugin-astro": "^0.12.0",
|
||||||
"rehype-slug": "^6.0.0",
|
"rehype-slug": "^6.0.0",
|
||||||
"sass": "^1.66.1",
|
"sass": "^1.66.1",
|
||||||
"sharp": "^0.33.4",
|
"sharp": "^0.32.6",
|
||||||
"shiki": "^0.14.5",
|
"shiki": "^0.14.5",
|
||||||
"unified": "^11.0.2",
|
"unified": "^11.0.2",
|
||||||
"unist-util-visit": "^5.0.0"
|
"unist-util-visit": "^5.0.0"
|
||||||
|
|
Loading…
Reference in a new issue