+21 -26

.forgejo/workflows/ci.yaml

··· 7 7 8 8 jobs: 9 9 check: 10 10 - runs-on: codeberg-small-lazy 10 10 + runs-on: debian-trixie 11 11 container: 12 12 - image: docker.io/library/node:24-trixie-slim@sha256:fcdfd7bcd8f641c8c76a8950343c73912d68ba341e8dd1074e663b784d3e76f4 12 12 + image: docker.io/library/node:24-trixie-slim@sha256:b05474903f463ce4064c09986525e6588c3e66c51b69be9c93a39fb359f883ce 13 13 steps: 14 14 - name: Check out source code 15 15 - uses: https://code.forgejo.org/actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 15 15 + uses: https://code.forgejo.org/actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 16 16 - name: Set up toolchain 17 17 - uses: https://code.forgejo.org/actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6 17 17 + uses: https://code.forgejo.org/actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 18 18 with: 19 19 go-version: '>=1.25.0' 20 20 - name: Install dependencies ··· 34 34 # IMPORTANT: This workflow step will not work without the Releases unit enabled! 35 35 if: ${{ forge.ref == 'refs/heads/main' || startsWith(forge.event.ref, 'refs/tags/v') }} 36 36 needs: [check] 37 37 - runs-on: codeberg-small-lazy 37 37 + runs-on: debian-trixie 38 38 container: 39 39 - image: docker.io/library/node:24-trixie-slim@sha256:fcdfd7bcd8f641c8c76a8950343c73912d68ba341e8dd1074e663b784d3e76f4 39 39 + image: docker.io/library/node:24-trixie-slim@sha256:b05474903f463ce4064c09986525e6588c3e66c51b69be9c93a39fb359f883ce 40 40 steps: 41 41 - name: Check out source code 42 42 - uses: https://code.forgejo.org/actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 42 42 + uses: https://code.forgejo.org/actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 43 43 - name: Set up toolchain 44 44 - uses: https://code.forgejo.org/actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6 44 44 + uses: https://code.forgejo.org/actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 45 45 with: 46 46 go-version: '>=1.25.0' 47 47 - name: Install dependencies ··· 70 70 package: 71 71 if: ${{ forge.ref == 'refs/heads/main' || startsWith(forge.event.ref, 'refs/tags/v') }} 72 72 needs: [check] 73 73 - runs-on: codeberg-small-lazy 73 73 + runs-on: debian-trixie 74 74 container: 75 75 - image: docker.io/library/node:24-trixie-slim@sha256:fcdfd7bcd8f641c8c76a8950343c73912d68ba341e8dd1074e663b784d3e76f4 75 75 + image: docker.io/library/node:24-trixie-slim@sha256:b05474903f463ce4064c09986525e6588c3e66c51b69be9c93a39fb359f883ce 76 76 steps: 77 77 - name: Install dependencies 78 78 run: | 79 79 apt-get -y update 80 80 - apt-get -y install buildah ca-certificates 80 80 + apt-get -y install ca-certificates buildah qemu-user-binfmt 81 81 - name: Check out source code 82 82 - uses: https://code.forgejo.org/actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 82 82 + uses: https://code.forgejo.org/actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 83 83 - name: Build container 84 84 run: | 85 85 printf '[storage]\ndriver="vfs"\nrunroot="/run/containers/storage"\ngraphroot="/var/lib/containers/storage"\n' | tee /etc/containers/storage.conf 86 86 - buildah build --arch=amd64 --tag=container:${VER}-amd64 . 87 87 - buildah build --arch=arm64 --tag=container:${VER}-arm64 . 88 88 - buildah manifest create container:${VER} \ 89 89 - container:${VER}-amd64 \ 90 90 - container:${VER}-arm64 86 86 + buildah build --arch=amd64 --tag=container:amd64 87 87 + buildah build --arch=arm64 --tag=container:arm64 88 88 + buildah manifest create container container:amd64 container:arm64 91 89 env: 92 90 BUILDAH_ISOLATION: chroot 93 93 - VER: ${{ startsWith(forge.event.ref, 'refs/tags/v') && forge.ref_name || 'latest' }} 94 91 - if: ${{ forge.repository == 'git-pages/git-pages-cli' }} 95 92 name: Push container to Codeberg 96 93 run: | 97 97 - buildah login --authfile=/tmp/authfile-${FORGE}.json \ 94 94 + buildah login --authfile=/tmp/authfile.json \ 98 95 -u ${{ vars.PACKAGES_USER }} -p ${{ secrets.PACKAGES_TOKEN }} ${FORGE} 99 99 - buildah manifest push --authfile=/tmp/authfile-${FORGE}.json \ 100 100 - --all container:${VER} "docker://${FORGE}/${{ forge.repository }}:${VER/v/}" 96 96 + buildah manifest push --authfile=/tmp/authfile.json \ 97 97 + --all container "docker://${FORGE}/${{ forge.repository }}:${VER/v/}" 101 98 env: 102 102 - BUILDAH_ISOLATION: chroot 103 99 FORGE: codeberg.org 104 100 VER: ${{ startsWith(forge.event.ref, 'refs/tags/v') && forge.ref_name || 'latest' }} 105 101 - if: ${{ forge.repository == 'git-pages/git-pages-cli' }} 106 102 name: Push container to code.forgejo.org 107 103 run: | 108 108 - buildah login --authfile=/tmp/authfile-${FORGE}.json \ 104 104 + buildah login --authfile=/tmp/authfile.json \ 109 105 -u ${{ vars.PACKAGES_USER }} -p ${{ secrets.CFO_PACKAGES_TOKEN }} ${FORGE} 110 110 - buildah manifest push --authfile=/tmp/authfile-${FORGE}.json \ 111 111 - --all container:${VER} "docker://${FORGE}/${{ forge.repository }}:${VER/v/}" 106 106 + buildah manifest push --authfile=/tmp/authfile.json \ 107 107 + --all container "docker://${FORGE}/${{ forge.repository }}:${VER/v/}" 112 108 env: 113 113 - BUILDAH_ISOLATION: chroot 114 109 FORGE: code.forgejo.org 115 110 VER: ${{ startsWith(forge.event.ref, 'refs/tags/v') && forge.ref_name || 'latest' }}

+1 -1

Dockerfile

··· 1 1 - FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.25-alpine@sha256:d3f0cf7723f3429e3f9ed846243970b20a2de7bae6a5b66fc5914e228d831bbb AS builder 1 1 + FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.25-alpine@sha256:ac09a5f469f307e5da71e766b0bd59c9c49ea460a528cc3e6686513d64a6f1fb AS builder 2 2 ARG TARGETOS TARGETARCH 3 3 RUN apk --no-cache add ca-certificates git 4 4 WORKDIR /build

-14

LICENSE-0BSD.txt

··· 1 1 - Copyright (C) git-pages contributors 2 2 - Copyright (C) Catherine 'whitequark' 3 3 - 4 4 - Permission to use, copy, modify, and/or distribute this software for 5 5 - any purpose with or without fee is hereby granted. 6 6 - 7 7 - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 8 8 - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 9 9 - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 10 10 - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 11 11 - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 12 12 - AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT 13 13 - OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 14 14 -

+14

LICENSE.txt

··· 1 1 + Copyright (C) git-pages contributors 2 2 + Copyright (C) Catherine 'whitequark' 3 3 + 4 4 + Permission to use, copy, modify, and/or distribute this software for 5 5 + any purpose with or without fee is hereby granted. 6 6 + 7 7 + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 8 8 + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 9 9 + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 10 10 + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 11 11 + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 12 12 + AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT 13 13 + OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 14 14 +

+4 -3

README.md

··· 3 3 4 4 _git-pages-cli_ is a command-line application for publishing sites to [git-pages]. 5 5 6 6 - If you want to publish a site from a Forgejo Actions workflow, use [git-pages/action] instead. 6 6 + > [!TIP] 7 7 + > If you want to publish a site from a CI workflow, use the [Forgejo Action][git-pages-action] instead. 7 8 8 9 [git-pages]: https://codeberg.org/git-pages/git-pages 9 9 - [git-pages/action]: https://codeberg.org/git-pages/action 10 10 + [git-pages-action]: https://codeberg.org/git-pages/action 10 11 11 12 12 13 Installation ··· 125 126 License 126 127 ------- 127 128 128 128 - [0-clause BSD](LICENSE-0BSD.txt) 129 129 + [0-clause BSD](LICENSE.txt)

+24

flake.lock

··· 18 18 "type": "github" 19 19 } 20 20 }, 21 21 + "gomod2nix": { 22 22 + "inputs": { 23 23 + "flake-utils": [ 24 24 + "flake-utils" 25 25 + ], 26 26 + "nixpkgs": [ 27 27 + "nixpkgs" 28 28 + ] 29 29 + }, 30 30 + "locked": { 31 31 + "lastModified": 1763982521, 32 32 + "narHash": "sha256-ur4QIAHwgFc0vXiaxn5No/FuZicxBr2p0gmT54xZkUQ=", 33 33 + "owner": "nix-community", 34 34 + "repo": "gomod2nix", 35 35 + "rev": "02e63a239d6eabd595db56852535992c898eba72", 36 36 + "type": "github" 37 37 + }, 38 38 + "original": { 39 39 + "owner": "nix-community", 40 40 + "repo": "gomod2nix", 41 41 + "type": "github" 42 42 + } 43 43 + }, 21 44 "nix-filter": { 22 45 "locked": { 23 46 "lastModified": 1757882181, ··· 52 75 "root": { 53 76 "inputs": { 54 77 "flake-utils": "flake-utils", 78 78 + "gomod2nix": "gomod2nix", 55 79 "nix-filter": "nix-filter", 56 80 "nixpkgs": "nixpkgs" 57 81 }

+22 -4

flake.nix

··· 3 3 nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; 4 4 flake-utils.url = "github:numtide/flake-utils"; 5 5 nix-filter.url = "github:numtide/nix-filter"; 6 6 + 7 7 + gomod2nix = { 8 8 + url = "github:nix-community/gomod2nix"; 9 9 + inputs.nixpkgs.follows = "nixpkgs"; 10 10 + inputs.flake-utils.follows = "flake-utils"; 11 11 + }; 6 12 }; 7 13 8 14 outputs = ··· 11 17 nixpkgs, 12 18 flake-utils, 13 19 nix-filter, 14 14 - }: 20 20 + ... 21 21 + }@inputs: 15 22 flake-utils.lib.eachDefaultSystem ( 16 23 system: 17 24 let 18 18 - pkgs = nixpkgs.legacyPackages.${system}; 25 25 + pkgs = import nixpkgs { 26 26 + inherit system; 19 27 20 20 - git-pages-cli = pkgs.buildGo125Module { 28 28 + overlays = [ 29 29 + inputs.gomod2nix.overlays.default 30 30 + ]; 31 31 + }; 32 32 + 33 33 + git-pages-cli = pkgs.buildGoApplication { 21 34 pname = "git-pages-cli"; 22 35 version = "0"; 23 36 ··· 41 54 "-s -w" 42 55 ]; 43 56 44 44 - vendorHash = "sha256-5vjUhN3lCr41q91lOD7v0F9c6a8GJj7wBGnnzgFBhJU="; 57 57 + go = pkgs.go_1_25; 58 58 + modules = ./gomod2nix.toml; 45 59 }; 46 60 in 47 61 { ··· 50 64 devShells.default = pkgs.mkShell { 51 65 inputsFrom = [ 52 66 git-pages-cli 67 67 + ]; 68 68 + 69 69 + packages = with pkgs; [ 70 70 + gomod2nix 53 71 ]; 54 72 }; 55 73

+2 -2

go.mod

··· 3 3 go 1.25.0 4 4 5 5 require ( 6 6 - github.com/klauspost/compress v1.18.1 7 7 - github.com/spf13/pflag v1.0.10 8 6 github.com/google/uuid v1.6.0 7 7 + github.com/klauspost/compress v1.18.2 8 8 + github.com/spf13/pflag v1.0.10 9 9 )

+2 -2

go.sum

··· 1 1 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= 2 2 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 3 3 - github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3JH2co= 4 4 - github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0= 3 3 + github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk= 4 4 + github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= 5 5 github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= 6 6 github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=

+12

gomod2nix.toml

··· 1 1 + schema = 3 2 2 + 3 3 + [mod] 4 4 + [mod."github.com/google/uuid"] 5 5 + version = "v1.6.0" 6 6 + hash = "sha256-VWl9sqUzdOuhW0KzQlv0gwwUQClYkmZwSydHG2sALYw=" 7 7 + [mod."github.com/klauspost/compress"] 8 8 + version = "v1.18.2" 9 9 + hash = "sha256-mRa+6qEi5joqQao13ZFogmq67rOQzHCVbCCjKA+HKEc=" 10 10 + [mod."github.com/spf13/pflag"] 11 11 + version = "v1.0.10" 12 12 + hash = "sha256-uDPnWjHpSrzXr17KEYEA1yAbizfcsfo5AyztY2tS6ZU="

+228 -67

main.go

··· 2 2 3 3 import ( 4 4 "archive/tar" 5 5 + "bufio" 5 6 "bytes" 7 7 + "crypto" 6 8 "crypto/sha256" 9 9 + "encoding/hex" 10 10 + "errors" 7 11 "fmt" 8 12 "io" 9 13 "io/fs" ··· 11 15 "net/url" 12 16 "os" 13 17 "runtime/debug" 18 18 + "strconv" 19 19 + "strings" 14 20 15 21 "github.com/google/uuid" 16 22 "github.com/klauspost/compress/zstd" 17 23 "github.com/spf13/pflag" 18 24 ) 19 25 26 26 + // By default the version information is retrieved from VCS. If not available during build, 27 27 + // override this variable using linker flags to change the displayed version. 28 28 + // Example: `-ldflags "-X main.versionOverride=v1.2.3"` 29 29 + var versionOverride = "" 30 30 + 31 31 + func versionInfo() string { 32 32 + version := "(unknown)" 33 33 + if versionOverride != "" { 34 34 + version = versionOverride 35 35 + } else if buildInfo, ok := debug.ReadBuildInfo(); ok { 36 36 + version = buildInfo.Main.Version 37 37 + } 38 38 + return fmt.Sprintf("git-pages-cli %s", version) 39 39 + } 40 40 + 20 41 var passwordFlag = pflag.String("password", "", "password for DNS challenge authorization") 21 42 var tokenFlag = pflag.String("token", "", "token for forge authorization") 22 43 var challengeFlag = pflag.Bool("challenge", false, "compute DNS challenge entry from password (output zone file record)") 23 44 var challengeBareFlag = pflag.Bool("challenge-bare", false, "compute DNS challenge entry from password (output bare TXT value)") 24 45 var uploadGitFlag = pflag.String("upload-git", "", "replace site with contents of specified git repository") 25 25 - var uploadDirFlag = pflag.String("upload-dir", "", "replace site with contents of specified directory") 26 26 - var deleteFlag = pflag.Bool("delete", false, "delete site") 46 46 + var uploadDirFlag = pflag.String("upload-dir", "", "replace whole site or a path with contents of specified directory") 47 47 + var deleteFlag = pflag.Bool("delete", false, "delete whole site or a path") 27 48 var debugManifestFlag = pflag.Bool("debug-manifest", false, "retrieve site manifest as ProtoJSON, for debugging") 28 49 var serverFlag = pflag.String("server", "", "hostname of server to connect to") 29 29 - var verboseFlag = pflag.Bool("verbose", false, "display more information for debugging") 30 30 - var versionFlag = pflag.Bool("version", false, "display version information") 50 50 + var pathFlag = pflag.String("path", "", "partially update site at specified path") 51 51 + var parentsFlag = pflag.Bool("parents", false, "create parent directories of --path") 52 52 + var atomicFlag = pflag.Bool("atomic", false, "require partial updates to be atomic") 53 53 + var incrementalFlag = pflag.Bool("incremental", false, "make --upload-dir only upload changed files") 54 54 + var verboseFlag = pflag.BoolP("verbose", "v", false, "display more information for debugging") 55 55 + var versionFlag = pflag.BoolP("version", "V", false, "display version information") 31 56 32 57 func singleOperation() bool { 33 58 operations := 0 ··· 55 80 return operations == 1 56 81 } 57 82 58 58 - func versionInfo() string { 59 59 - version := "(unknown)" 60 60 - if versionOverride != "" { 61 61 - version = versionOverride 62 62 - } else if buildInfo, ok := debug.ReadBuildInfo(); ok { 63 63 - version = buildInfo.Main.Version 64 64 - } 65 65 - return fmt.Sprintf("git-pages-cli %s", version) 83 83 + func gitBlobSHA256(data []byte) string { 84 84 + h := crypto.SHA256.New() 85 85 + h.Write([]byte("blob ")) 86 86 + h.Write([]byte(strconv.FormatInt(int64(len(data)), 10))) 87 87 + h.Write([]byte{0}) 88 88 + h.Write(data) 89 89 + return hex.EncodeToString(h.Sum(nil)) 66 90 } 67 91 68 68 - func displayFS(root fs.FS) error { 92 92 + func displayFS(root fs.FS, prefix string) error { 69 93 return fs.WalkDir(root, ".", func(name string, entry fs.DirEntry, err error) error { 70 94 if err != nil { 71 95 return err 72 96 } 73 97 switch { 74 74 - case entry.Type() == 0: 75 75 - fmt.Fprintln(os.Stderr, "file", name) 76 76 - case entry.Type() == fs.ModeDir: 77 77 - fmt.Fprintln(os.Stderr, "dir", name) 98 98 + case entry.Type().IsDir(): 99 99 + fmt.Fprintf(os.Stderr, "dir %s%s\n", prefix, name) 100 100 + case entry.Type().IsRegular(): 101 101 + fmt.Fprintf(os.Stderr, "file %s%s\n", prefix, name) 78 102 case entry.Type() == fs.ModeSymlink: 79 79 - fmt.Fprintln(os.Stderr, "symlink", name) 103 103 + fmt.Fprintf(os.Stderr, "symlink %s%s\n", prefix, name) 80 104 default: 81 81 - fmt.Fprintln(os.Stderr, "other", name) 105 105 + fmt.Fprintf(os.Stderr, "other %s%s\n", prefix, name) 82 106 } 83 107 return nil 84 108 }) 85 109 } 86 110 87 87 - func archiveFS(root fs.FS) (result []byte, err error) { 88 88 - buffer := bytes.Buffer{} 89 89 - zstdWriter, _ := zstd.NewWriter(&buffer) 111 111 + // It doesn't make sense to use incremental updates for very small files since the cost of 112 112 + // repeating a request to fill in a missing blob is likely to be higher than any savings gained. 113 113 + const incrementalSizeThreshold = 256 114 114 + 115 115 + func archiveFS(writer io.Writer, root fs.FS, prefix string, needBlobs []string) (err error) { 116 116 + requestedSet := make(map[string]struct{}) 117 117 + for _, hash := range needBlobs { 118 118 + requestedSet[hash] = struct{}{} 119 119 + } 120 120 + zstdWriter, _ := zstd.NewWriter(writer) 90 121 tarWriter := tar.NewWriter(zstdWriter) 91 91 - err = tarWriter.AddFS(root) 92 92 - if err != nil { 122 122 + if err = fs.WalkDir(root, ".", func(name string, entry fs.DirEntry, err error) error { 123 123 + if err != nil { 124 124 + return err 125 125 + } 126 126 + header := &tar.Header{} 127 127 + data := []byte{} 128 128 + if prefix == "" && name == "." { 129 129 + return nil 130 130 + } else if name == "." { 131 131 + header.Name = prefix 132 132 + } else { 133 133 + header.Name = prefix + name 134 134 + } 135 135 + switch { 136 136 + case entry.Type().IsDir(): 137 137 + header.Typeflag = tar.TypeDir 138 138 + header.Name += "/" 139 139 + case entry.Type().IsRegular(): 140 140 + header.Typeflag = tar.TypeReg 141 141 + if data, err = fs.ReadFile(root, name); err != nil { 142 142 + return err 143 143 + } 144 144 + if *incrementalFlag && len(data) > incrementalSizeThreshold { 145 145 + hash := gitBlobSHA256(data) 146 146 + if _, requested := requestedSet[hash]; !requested { 147 147 + header.Typeflag = tar.TypeSymlink 148 148 + header.Linkname = "/git/blobs/" + hash 149 149 + data = nil 150 150 + } 151 151 + } 152 152 + case entry.Type() == fs.ModeSymlink: 153 153 + header.Typeflag = tar.TypeSymlink 154 154 + if header.Linkname, err = fs.ReadLink(root, name); err != nil { 155 155 + return err 156 156 + } 157 157 + default: 158 158 + return errors.New("tar: cannot add non-regular file") 159 159 + } 160 160 + header.Size = int64(len(data)) 161 161 + if err = tarWriter.WriteHeader(header); err != nil { 162 162 + return err 163 163 + } 164 164 + if _, err = tarWriter.Write(data); err != nil { 165 165 + return err 166 166 + } 167 167 + return err 168 168 + }); err != nil { 93 169 return 94 170 } 95 95 - err = tarWriter.Close() 96 96 - if err != nil { 171 171 + if err = tarWriter.Close(); err != nil { 97 172 return 98 173 } 99 99 - err = zstdWriter.Close() 100 100 - if err != nil { 174 174 + if err = zstdWriter.Close(); err != nil { 101 175 return 102 176 } 103 103 - result = buffer.Bytes() 104 177 return 105 178 } 106 179 180 180 + // Stream archive data without ever loading the entire working set into RAM. 181 181 + func streamArchiveFS(root fs.FS, prefix string, needBlobs []string) io.ReadCloser { 182 182 + reader, writer := io.Pipe() 183 183 + go func() { 184 184 + err := archiveFS(writer, root, prefix, needBlobs) 185 185 + if err != nil { 186 186 + writer.CloseWithError(err) 187 187 + } else { 188 188 + writer.Close() 189 189 + } 190 190 + }() 191 191 + return reader 192 192 + } 193 193 + 194 194 + func makeWhiteout(path string) (reader io.Reader) { 195 195 + buffer := &bytes.Buffer{} 196 196 + tarWriter := tar.NewWriter(buffer) 197 197 + tarWriter.WriteHeader(&tar.Header{ 198 198 + Typeflag: tar.TypeChar, 199 199 + Name: path, 200 200 + }) 201 201 + tarWriter.Flush() 202 202 + return buffer 203 203 + } 204 204 + 107 205 const usageExitCode = 125 108 206 207 207 + func usage() { 208 208 + fmt.Fprintf(os.Stderr, 209 209 + "Usage: %s <site-url> {--challenge|--upload-git url|--upload-dir path|--delete} [options...]\n", 210 210 + os.Args[0], 211 211 + ) 212 212 + pflag.PrintDefaults() 213 213 + } 214 214 + 109 215 func main() { 216 216 + pflag.Usage = usage 110 217 pflag.Parse() 111 218 if !singleOperation() || (!*versionFlag && len(pflag.Args()) != 1) { 112 112 - fmt.Fprintf(os.Stderr, 113 113 - "Usage: %s <site-url> [--challenge|--upload-git url|--upload-dir path|--delete]\n", 114 114 - os.Args[0], 115 115 - ) 219 219 + pflag.Usage() 116 220 os.Exit(usageExitCode) 117 221 } 118 222 ··· 126 230 os.Exit(usageExitCode) 127 231 } 128 232 233 233 + var pathPrefix string 234 234 + if *pathFlag != "" { 235 235 + if *uploadDirFlag == "" && !*deleteFlag { 236 236 + fmt.Fprintf(os.Stderr, "--path requires --upload-dir or --delete") 237 237 + os.Exit(usageExitCode) 238 238 + } else { 239 239 + pathPrefix = strings.Trim(*pathFlag, "/") + "/" 240 240 + } 241 241 + } 242 242 + 129 243 var err error 130 244 siteURL, err := url.Parse(pflag.Args()[0]) 131 245 if err != nil { ··· 134 248 } 135 249 136 250 var request *http.Request 251 251 + var uploadDir *os.Root 137 252 switch { 138 253 case *challengeFlag || *challengeBareFlag: 139 254 if *passwordFlag == "" { ··· 165 280 request.Header.Add("Content-Type", "application/x-www-form-urlencoded") 166 281 167 282 case *uploadDirFlag != "": 168 168 - uploadDirFS, err := os.OpenRoot(*uploadDirFlag) 283 283 + uploadDir, err = os.OpenRoot(*uploadDirFlag) 169 284 if err != nil { 170 285 fmt.Fprintf(os.Stderr, "error: invalid directory: %s\n", err) 171 286 os.Exit(1) 172 287 } 173 288 174 289 if *verboseFlag { 175 175 - err := displayFS(uploadDirFS.FS()) 290 290 + err := displayFS(uploadDir.FS(), pathPrefix) 176 291 if err != nil { 177 292 fmt.Fprintf(os.Stderr, "error: %s\n", err) 178 293 os.Exit(1) 179 294 } 180 295 } 181 296 182 182 - requestBody, err := archiveFS(uploadDirFS.FS()) 183 183 - if err != nil { 184 184 - fmt.Fprintf(os.Stderr, "error: %s\n", err) 185 185 - os.Exit(1) 297 297 + if *pathFlag == "" { 298 298 + request, err = http.NewRequest("PUT", siteURL.String(), nil) 299 299 + } else { 300 300 + request, err = http.NewRequest("PATCH", siteURL.String(), nil) 186 301 } 187 187 - 188 188 - request, err = http.NewRequest("PUT", siteURL.String(), bytes.NewReader(requestBody)) 189 302 if err != nil { 190 303 fmt.Fprintf(os.Stderr, "error: %s\n", err) 191 304 os.Exit(1) 192 305 } 306 306 + request.Body = streamArchiveFS(uploadDir.FS(), pathPrefix, []string{}) 307 307 + request.ContentLength = -1 193 308 request.Header.Add("Content-Type", "application/x-tar+zstd") 309 309 + request.Header.Add("Accept", "application/vnd.git-pages.unresolved;q=1.0, text/plain;q=0.9") 310 310 + if *parentsFlag { 311 311 + request.Header.Add("Create-Parents", "yes") 312 312 + } else { 313 313 + request.Header.Add("Create-Parents", "no") 314 314 + } 194 315 195 316 case *deleteFlag: 196 196 - request, err = http.NewRequest("DELETE", siteURL.String(), nil) 197 197 - if err != nil { 198 198 - fmt.Fprintf(os.Stderr, "error: %s\n", err) 199 199 - os.Exit(1) 317 317 + if *pathFlag == "" { 318 318 + request, err = http.NewRequest("DELETE", siteURL.String(), nil) 319 319 + if err != nil { 320 320 + fmt.Fprintf(os.Stderr, "error: %s\n", err) 321 321 + os.Exit(1) 322 322 + } 323 323 + } else { 324 324 + request, err = http.NewRequest("PATCH", siteURL.String(), makeWhiteout(pathPrefix)) 325 325 + if err != nil { 326 326 + fmt.Fprintf(os.Stderr, "error: %s\n", err) 327 327 + os.Exit(1) 328 328 + } 329 329 + request.Header.Add("Content-Type", "application/x-tar") 200 330 } 201 331 202 332 case *debugManifestFlag: ··· 211 341 panic("no operation chosen") 212 342 } 213 343 request.Header.Add("User-Agent", versionInfo()) 344 344 + if request.Method == "PATCH" { 345 345 + if *atomicFlag { 346 346 + request.Header.Add("Atomic", "yes") 347 347 + request.Header.Add("Race-Free", "yes") // deprecated name, to be removed soon 348 348 + } else { 349 349 + request.Header.Add("Atomic", "no") 350 350 + request.Header.Add("Race-Free", "no") // deprecated name, to be removed soon 351 351 + } 352 352 + } 214 353 switch { 215 354 case *passwordFlag != "": 216 355 request.Header.Add("Authorization", fmt.Sprintf("Pages %s", *passwordFlag)) ··· 228 367 request.Header.Set("Host", siteURL.Host) 229 368 } 230 369 231 231 - response, err := http.DefaultClient.Do(request) 232 232 - if err != nil { 233 233 - fmt.Fprintf(os.Stderr, "error: %s\n", err) 234 234 - os.Exit(1) 235 235 - } 236 236 - if *verboseFlag { 237 237 - fmt.Fprintf(os.Stderr, "server: %s\n", response.Header.Get("Server")) 238 238 - } 239 239 - if *debugManifestFlag { 240 240 - if response.StatusCode == 200 { 241 241 - io.Copy(os.Stdout, response.Body) 242 242 - fmt.Fprintf(os.Stdout, "\n") 243 243 - } else { 244 244 - io.Copy(os.Stderr, response.Body) 370 370 + displayServer := *verboseFlag 371 371 + for { 372 372 + response, err := http.DefaultClient.Do(request) 373 373 + if err != nil { 374 374 + fmt.Fprintf(os.Stderr, "error: %s\n", err) 245 375 os.Exit(1) 246 376 } 247 247 - } else { // an update operation 248 248 - if response.StatusCode == 200 { 249 249 - fmt.Fprintf(os.Stdout, "result: %s\n", response.Header.Get("Update-Result")) 250 250 - io.Copy(os.Stdout, response.Body) 251 251 - } else { 252 252 - fmt.Fprintf(os.Stderr, "result: error\n") 253 253 - io.Copy(os.Stderr, response.Body) 254 254 - os.Exit(1) 377 377 + if displayServer { 378 378 + fmt.Fprintf(os.Stderr, "server: %s\n", response.Header.Get("Server")) 379 379 + displayServer = false 380 380 + } 381 381 + if *debugManifestFlag { 382 382 + if response.StatusCode == http.StatusOK { 383 383 + io.Copy(os.Stdout, response.Body) 384 384 + fmt.Fprintf(os.Stdout, "\n") 385 385 + } else { 386 386 + io.Copy(os.Stderr, response.Body) 387 387 + os.Exit(1) 388 388 + } 389 389 + } else { // an update operation 390 390 + if *verboseFlag { 391 391 + fmt.Fprintf(os.Stderr, "response: %d %s\n", 392 392 + response.StatusCode, response.Header.Get("Content-Type")) 393 393 + } 394 394 + if response.StatusCode == http.StatusUnprocessableEntity && 395 395 + response.Header.Get("Content-Type") == "application/vnd.git-pages.unresolved" { 396 396 + needBlobs := []string{} 397 397 + scanner := bufio.NewScanner(response.Body) 398 398 + for scanner.Scan() { 399 399 + needBlobs = append(needBlobs, scanner.Text()) 400 400 + } 401 401 + response.Body.Close() 402 402 + if *verboseFlag { 403 403 + fmt.Fprintf(os.Stderr, "incremental: need %d blobs\n", len(needBlobs)) 404 404 + } 405 405 + request.Body = streamArchiveFS(uploadDir.FS(), pathPrefix, needBlobs) 406 406 + continue // resubmit 407 407 + } else if response.StatusCode == http.StatusOK { 408 408 + fmt.Fprintf(os.Stdout, "result: %s\n", response.Header.Get("Update-Result")) 409 409 + io.Copy(os.Stdout, response.Body) 410 410 + } else { 411 411 + fmt.Fprintf(os.Stderr, "result: error\n") 412 412 + io.Copy(os.Stderr, response.Body) 413 413 + os.Exit(1) 414 414 + } 255 415 } 416 416 + break 256 417 } 257 418 }

+3 -1

renovate.json

··· 9 9 "lockFileMaintenance": { 10 10 "enabled": true, 11 11 "automerge": false 12 12 - } 12 12 + }, 13 13 + "semanticCommits": "disabled", 14 14 + "commitMessagePrefix": "[Renovate]" 13 15 }

-7

version.go

··· 1 1 - // By default the version information is retrieved from VCS. 2 2 - // If not available during build, override it in this file 3 3 - // or using -ldflags "-X main.versionOverride=...": 4 4 - 5 5 - package main 6 6 - 7 7 - var versionOverride = "" // set to e.g. "v1.2.3" as appropriate