Tweaks for homebrew

Author: fileformat

.github/actions/build.sh

@@ -25,7 +25,7 @@ echo "INFO: building"
 go build \
     -a \
     -trimpath \
-    -ldflags "-s -w -extldflags '-static' -X github.com/FileFormatInfo/fflint/cmd.COMMIT=$GITHUB_SHA -X github.com/FileFormatInfo/fflint/cmd.LASTMOD=$LASTMOD -X github.com/FileFormatInfo/fflint/cmd.VERSION=$VERSION" \
+    -ldflags "-s -w -extldflags '-static' -X main.COMMIT=$GITHUB_SHA -X main.LASTMOD=$LASTMOD -X main.VERSION=$VERSION -X main.BUILTBY=build.sh" \
     -installsuffix cgo \
     -tags netgo \
     -o "${APP_HOME}/dist/fflint" \

.github/workflows/build.yaml

@@ -2,13 +2,14 @@ name: build
 
 on:
   push:
-    exclude:
-      - 'v*'
     ignore:
       - 'docs/**'
       - '.github/**'
       - '*.sh'
       - '*.md'
+    tags-ignore:
+      - '**'
+
   workflow_dispatch:
 
 jobs:
@@ -21,13 +22,9 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.21
+          go-version: 1.24
 
-      - name: GoReleaser Build
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          distribution: goreleaser
-          version: latest
-          args: build --snapshot --single-target
+      - name: Build
+        run: go build -o fflint ./cmd/fflint/main.go

.github/workflows/release.yaml

@@ -16,23 +16,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
       - name: Fetch all tags
         run: git fetch --force --tags
 
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.21
+          go-version: 1.24
 
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v7
         with:
           distribution: goreleaser
           version: latest
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          HOMEBREW_TOKEN: ${{ secrets.HOMEBREW_TOKEN }}

.goreleaser.yaml

@@ -1,5 +1,5 @@
-# This is an example .goreleaser.yml file with some sensible defaults.
-# Make sure to check the documentation at https://goreleaser.com
+version: 2
+
 before:
   hooks:
     - go mod tidy
@@ -11,15 +11,20 @@ builds:
   - env:
       - CGO_ENABLED=0
     ldflags:
-      -  -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=goreleaser
+      - -s
+      - -w
+      - -X main.VERSION={{.Version}}
+      - -X main.LASTMOD={{.Timestamp}}
+      - -X main.COMMIT={{.ShortCommit}}
+      - -X main.BUILTBY=goreleaser
     main: ./cmd/fflint/main.go
     goos:
       - linux
       - windows
       - darwin
 
 archives:
-  - format: tar.gz
+  - formats: [ tar.gz ]
     # this name template makes the OS and Arch compatible with the results of uname.
     name_template: >-
       {{ .ProjectName }}_
@@ -31,19 +36,42 @@ archives:
     # use zip for windows archives
     format_overrides:
     - goos: windows
-      format: zip
+      formats: [ zip ]
 checksum:
   name_template: 'checksums.txt'
 snapshot:
-  name_template: "{{ incpatch .Version }}-next"
+  version_template: "{{ incpatch .Version }}-next"
 changelog:
   sort: asc
   filters:
     exclude:
       - '^docs:'
       - '^test:'
 
-# The lines beneath this are called `modelines`. See `:help modeline`
-# Feel free to remove those if you don't want/use them.
-# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
-# vim: set ts=2 sw=2 tw=0 fo=cnqoj
+homebrew_casks:
+  - name: fflint
+    binaries:
+      - fflint
+    manpages:
+      - manpages/fflint.1.gz
+    completions:
+      bash: completions/fflint.bash
+      zsh: completions/fflint.zsh
+      fish: completions/fflint.fish
+    directory: Casks
+    skip_upload: false
+    description: "File formt linter"
+    homepage: "https://www.fflint.dev/"
+    license: "MIT"
+    repository:
+      owner: FileFormatInfo
+      name: homebrew-tap
+      branch: main
+      token: "{{ .Env.HOMEBREW_TOKEN }}"
+    hooks:
+      post:
+        install: |
+          if OS.mac?
+            system_command "/usr/bin/xattr", args: ["-dr", "com.apple.quarantine", "#{staged_path}/fflint"]
+          end
+

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023-2024 Andrew Marcuse
+Copyright (c) 2023-2026 Andrew Marcuse
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build.sh bin/gr-build.shbuild.sh renamed to bin/gr-build.sh

@@ -17,7 +17,7 @@ rm -rf "${MANPAGES_DIR}"
 mkdir "${MANPAGES_DIR}"
 
 echo "INFO: generating manpages"
-go run "${REPO_HOME}/cmd/mangen" man
-#| gzip -c -9 >"${MANPAGES_DIR}/fflint.1.gz"
+go run "${REPO_HOME}/cmd/mangen" man \
+    | gzip -c -9 >"${MANPAGES_DIR}/fflint.1.gz"
 
 echo "INFO: manpages complete at $(date -u +%Y-%m-%dT%H:%M:%SZ)"

bin/manpages.sh

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+#
+# make a new release by pushing a new tag to git
+#
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+echo "INFO: Starting release process at $(date -u +%Y-%m-%dT%H:%M:%SZ)"
+
+TAG=${1:-DEFAULT}
+
+if [[ "$TAG" == "DEFAULT" ]]; then
+	echo "INFO: No tag provided, calculating next version based on git tags"
+	# get tags from remote
+	git fetch --tags
+	# get the latest tag from git and increment the patch version
+	LATEST_TAG=$(git tag --sort=v:refname | tail -1)
+	echo "INFO: Latest tag is '${LATEST_TAG}'"
+	# if none, start at 0.1.0
+	if [[ -z "$LATEST_TAG" ]]; then
+		TAG="0.1.0"
+	else
+		IFS='.' read -r -a VERSION_PARTS <<< "$LATEST_TAG"
+		MAJOR=${VERSION_PARTS[0]}
+		MINOR=${VERSION_PARTS[1]}
+		PATCH=${VERSION_PARTS[2]}
+		PATCH=$((PATCH + 1))
+		TAG="$MAJOR.$MINOR.$PATCH"
+	fi
+fi
+
+echo "INFO: Releasing version ${TAG}"
+
+git tag -a "$TAG" -m "Release version ${TAG}"
+git push origin "$TAG"
+
+echo "INFO: Completed release process at $(date -u +%Y-%m-%dT%H:%M:%SZ)"

bin/release.sh

@@ -10,18 +10,18 @@ import (
 )
 
 var (
-	version = "0.0.0"
-	commit  = "local"
-	date    = "local"
-	builtBy = "unknown"
+	VERSION = "0.0.0"
+	COMMIT  = "local"
+	LASTMOD = "local"
+	BUILTBY = "unknown"
 )
 
 func main() {
 	var rootCmd = &cobra.Command{
 		Use:           "fflint",
 		Short:         "A linter to make sure your files are valid",
 		Long:          `See [www.fflint.dev](https://www.fflint.dev/) for detailed instructions`,
-		Version:       version,
+		Version:       VERSION,
 		SilenceErrors: true,
 		SilenceUsage:  true,
 	}
@@ -30,7 +30,7 @@ func main() {
 	shared.AddCommon(rootCmd)
 
 	command.AddAllCommands(rootCmd)
-	command.AddVersionCommand(rootCmd, command.VersionInfo{Commit: commit, Version: version, LastMod: date, Builder: builtBy})
+	command.AddVersionCommand(rootCmd, command.VersionInfo{Commit: COMMIT, Version: VERSION, LastMod: LASTMOD, Builder: BUILTBY})
 
 	if err := rootCmd.Execute(); err != nil {
 		fmt.Fprintf(os.Stderr, "ERROR: %v\n", err.Error())

cmd/fflint/main.go

@@ -9,7 +9,6 @@ require (
 	github.com/adrg/frontmatter v0.2.0
 	github.com/antchfx/xmlquery v1.4.4
 	github.com/bmatcuk/doublestar/v4 v4.8.1
-	github.com/cevaris/ordered_map v0.0.0-20220813181356-34664b69742b
 	github.com/cheggaaa/pb/v3 v3.1.7
 	github.com/gorilla/sessions v1.4.0
 	github.com/mattn/go-isatty v0.0.20