Sync upstream

.github/workflows/build.yml

@@ -0,0 +1,34 @@
+name: 🏗️ Build
+
+on:
+  push:
+    branches: [main]
+  pull_request: ~
+
+env:
+  GO_VERSION: "1.25"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Go ${{ env.GO_VERSION }}
+        uses: actions/setup-go@v6
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: 📦 Install Mise
+        run: |
+          curl https://mise.run | sh
+          mise install
+
+      - name: Install dependencies
+        run: sudo apt install wv unrtf tidy
+
+      - name: Build
+        run: mise build
+
+      - name: Test
+        run: mise test

.github/workflows/release.yml

@@ -0,0 +1,31 @@
+name: 🚀 Publish Release
+
+on:
+  push:
+    tags:
+      - 'v?[0-9]+.[0-9]+.[0-9]+(-alpha[0-9]+|-beta[0-9]+)?'
+
+env:
+  GO_VERSION: "1.25"
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: 📦 Install Mise
+        run: |
+          curl https://mise.run | sh
+          mise install
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Run GoReleaser Snapshot
+        run: mise release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/snapshot.yml

@@ -0,0 +1,34 @@
+name: 👨‍🔧 Build Snapshot Release
+
+on:
+  workflow_dispatch: ~
+
+env:
+  GO_VERSION: "1.25"
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: 📦 Install Mise
+        run: |
+          curl https://mise.run | sh
+          mise install
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Run GoReleaser Snapshot
+        run: mise snapshot
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -2,3 +2,4 @@
 sajari-convert
 *tests/
 /dist
+/vendor

.goreleaser.yml

@@ -0,0 +1,50 @@
+project_name: docconv
+
+version: 2
+
+builds:
+  - id: docconv-build
+    main: ./docd
+    binary: docconv
+    ldflags:
+      - -extldflags '-static'
+    env:
+      - CGO_ENABLED=0
+    goos: [ linux ]
+    goarch: [ amd64, arm64 ]
+
+release:
+  prerelease: auto
+  name_template: "docconv {{.Version}}"
+  github:
+    owner: skpr
+    name: docconv
+
+nfpms:
+  - id: docconv-package
+    package_name: docconv
+    license: MIT
+    maintainer: Skpr
+    homepage: https://github.com/skpr/docconv
+    description: Fork of https://github.com/sajari/docconv to add additional package formats.
+    formats: [ apk ]
+    dependencies:
+      - tesseract-ocr
+      - poppler-utils
+    overrides:
+      apk:
+        dependencies:
+          - tesseract-ocr
+          - tesseract-ocr-dev
+          - poppler-utils
+
+dockers_v2:
+  - images:
+      - "docker.io/skpr/docconv"
+      - "ghcr.io/skpr/docconv"
+    tags:
+      - "{{ .Version }}"
+      - "latest"
+    platforms:
+      - linux/amd64
+      - linux/arm64

.mise.toml

@@ -0,0 +1,25 @@
+[tools]
+go = "1.25"
+"ubi:goreleaser/goreleaser" = "latest"
+
+[env]
+CGO_ENABLED=0
+LGFLAGS="-extldflags '-static'"
+
+[tasks.build]
+description = "Build the application"
+run = '''
+go build -v -o ./dist/docconv ./docd
+'''
+
+[tasks.test]
+description = "Run tests"
+run = "go test -v ./..."
+
+[tasks.snapshot]
+description = "Create a snapshot release with Goreleaser"
+run = "goreleaser release --snapshot --clean"
+
+[tasks.release]
+description = "Create a release with Goreleaser"
+run = "goreleaser release --clean"

Dockerfile

@@ -1,27 +1,8 @@
-ARG alpine_version=3.21
-FROM golang:1.24-alpine${alpine_version} as build
+ARG ALPINE_VERSION=3.21
+FROM alpine:$ALPINE_VERSION
 
-RUN apk add make \
-            cmake \
-            gcc \
-            g++ \
-            poppler-utils \
-            wv \
-            lynx \
-            tesseract-ocr-dev
+RUN apk add --no-cache tesseract-ocr tesseract-ocr-dev poppler-utils
 
-WORKDIR /go/src/code.sajari.com/docconv
-COPY . /go/src/code.sajari.com/docconv
-
-RUN go build -o dist/docconv -tags ocr code.sajari.com/docconv/docd
-
-ARG alpine_version=3.21
-FROM alpine:${alpine_version}
-
-RUN apk add tesseract-ocr \
-            tesseract-ocr-dev \
-            poppler-utils
-
-COPY --from=build /go/src/code.sajari.com/docconv/dist/docconv /usr/local/bin/docconv
-
-ENTRYPOINT ["/usr/local/bin/docconv"]
+ARG TARGETPLATFORM
+COPY $TARGETPLATFORM/docconv /usr/bin/docconv
+ENTRYPOINT ["/usr/bin/docconv"]