4 Commits

Author SHA1 Message Date
kjanat ea3f74c1b3 ci: bump to Go 1.26 and address PR review feedback
The autofix failure is fixed properly by moving to Go 1.26 instead of the
GOTOOLCHAIN workaround. The official golangci-lint v2.12.2 binary is built
with go1.26.2 and lints a Go 1.26 target fine (the earlier "not ready"
claim was from a locally go-installed binary compiled with Go 1.25), and
the Dockerfiles already use golang:1.26-alpine, so this also aligns the
module with the images.

- go.mod: go 1.25.0 -> 1.26.0, drop the toolchain pin (keeps the lint
  target at the go directive).
- Taskfile: revert modernize to plain modernize@latest; on Go 1.26 the
  GOTOOLCHAIN dance and its comments are unnecessary.
- ci.yml: pass the resolved Go version through an env var (GO_VERSION)
  instead of interpolating steps.setup-go.outputs.go-version directly into
  shell scripts (script-injection hygiene); grant the dependency-review job
  pull-requests: write so it can post its summary.
- parser.go: derive defaultBaseURL from riseHost instead of duplicating the
  host string; drop the redundant per-const comments.
- .golangci.yml: remove the redundant go-version comment.
- regenerate internal/exporters/output.docx.
2026-06-15 17:42:49 +00:00
kjanat b6f55156c4 ci: set GOTOOLCHAIN=auto inline for the modernize task
A task-level env: entry does not override GOTOOLCHAIN when setup-go has
already exported GOTOOLCHAIN=local job-wide, so the autofix job still
failed. Set GOTOOLCHAIN=auto inline on the modernize command itself, which
reliably overrides the inherited value and lets Go fetch the toolchain the
modernize analyzer requires.
2026-06-15 17:31:39 +00:00
kjanat 0827024e75 ci: keep modernize@latest, fetch its toolchain via GOTOOLCHAIN=auto
Replaces the earlier v0.21.0 pin. The modernize analyzer (gopls v0.22+)
requires Go 1.26, which the project doesn't target yet — and bumping the
module to 1.26 isn't viable because the current golangci-lint release is
built with Go 1.25 and refuses to lint a newer target. Instead, let the
modernize task fetch the toolchain it needs on demand via GOTOOLCHAIN=auto
(setup-go pins GOTOOLCHAIN=local in CI), so we stay on the latest analyzer
without touching the module's Go version.

Also bump golang.org/x/image v0.34.0 -> v0.42.0 via `go get -u ./...`.
2026-06-15 17:29:00 +00:00
kjanat 3b0090c692 ci: pin modernize tool to gopls v0.21.x for Go 1.25 compatibility
The autofix workflow's `task modernize` step installed the modernize
analyzer from gopls@latest, which as of v0.22.0 requires Go 1.26. The
project targets Go 1.25 (go.mod) and CI runs with GOTOOLCHAIN=local, so
the install failed. Pin to the v0.21.x line, which supports Go >= 1.25.
2026-06-15 17:24:05 +00:00
6 changed files with 26 additions and 24 deletions
+20 -10
View File
@@ -46,6 +46,13 @@ jobs:
go-version-file: go.mod
check-latest: true
# Expose the resolved Go version as an env var so it is never
# interpolated directly into a shell script (avoids script injection).
- name: Export Go version
env:
GO_VERSION: ${{ steps.setup-go.outputs.go-version }}
run: echo "GO_VERSION=$GO_VERSION" >> "$GITHUB_ENV"
- name: Install Task
uses: go-task/setup-task@v1
@@ -66,7 +73,7 @@ jobs:
{
cat << EOF
## 🔧 Test Environment
- **Go Version:** ${{ steps.setup-go.outputs.go-version }}
- **Go Version:** $GO_VERSION
- **OS:** ubuntu-latest
- **Timestamp:** $(date -u)
@@ -86,7 +93,7 @@ jobs:
# Generate test summary
{
cat << EOF
## 🧪 Test Results (Go ${{ steps.setup-go.outputs.go-version }})
## 🧪 Test Results (Go $GO_VERSION)
| Metric | Value |
| ----------- | ------------------------------------------------------------- |
@@ -148,7 +155,7 @@ jobs:
{
cat << EOF
## 📊 Code Coverage (Go ${{ steps.setup-go.outputs.go-version }})
## 📊 Code Coverage (Go $GO_VERSION)
**Total Coverage: $COVERAGE**
@@ -209,7 +216,7 @@ jobs:
if: failure()
uses: actions/upload-artifact@v6
with:
name: test-results-go-${{ steps.setup-go.outputs.go-version }}
name: test-results-go-${{ env.GO_VERSION }}
path: |
test-output.log
coverage/
@@ -219,7 +226,7 @@ jobs:
run: |
{
cat << EOF
## 🔍 Static Analysis (Go ${{ steps.setup-go.outputs.go-version }})
## 🔍 Static Analysis (Go $GO_VERSION)
EOF
@@ -263,9 +270,10 @@ jobs:
- name: Job Summary
if: always()
run: |
cat >> "$GITHUB_STEP_SUMMARY" << 'EOF'
## 📋 Job Summary (Go ${{ steps.setup-go.outputs.go-version }})
{
echo "## 📋 Job Summary (Go $GO_VERSION)"
echo ""
cat << 'EOF'
| Step | Status |
| --------------- | --------------------------------------------------------------- |
| Dependencies | Success |
@@ -275,12 +283,13 @@ jobs:
| Static Analysis | ${{ job.status == 'success' && 'Clean' || 'Issues' }} |
| Code Formatting | ${{ job.status == 'success' && 'Clean' || 'Issues' }} |
EOF
} >> "$GITHUB_STEP_SUMMARY"
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v5
with:
files: ./coverage/coverage.out
flags: Go ${{ steps.setup-go.outputs.go-version }}
flags: Go ${{ env.GO_VERSION }}
slug: kjanat/articulate-parser
token: ${{ secrets.CODECOV_TOKEN }}
@@ -288,7 +297,7 @@ jobs:
if: ${{ !cancelled() }}
uses: codecov/test-results-action@v1
with:
flags: Go ${{ steps.setup-go.outputs.go-version }}
flags: Go ${{ env.GO_VERSION }}
token: ${{ secrets.CODECOV_TOKEN }}
docker-test:
@@ -344,6 +353,7 @@ jobs:
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
if: github.event_name == 'pull_request'
steps:
- name: "Checkout Repository"
-4
View File
@@ -8,10 +8,6 @@ run:
# Timeout for total work
timeout: 5m
# Skip directories (not allowed in config v2, will use issues exclude instead)
# Go version is autodetected from go.mod
# Include test files
tests: true
+2 -4
View File
@@ -1,8 +1,6 @@
module github.com/kjanat/articulate-parser
go 1.25.0
toolchain go1.25.5
go 1.26.0
require (
github.com/fumiama/go-docx v0.0.0-20250506085032-0c30fd09304b
@@ -12,5 +10,5 @@ require (
require (
github.com/fumiama/imgsz v0.0.4 // indirect
golang.org/x/image v0.34.0 // indirect
golang.org/x/image v0.42.0 // indirect
)
+2 -2
View File
@@ -2,8 +2,8 @@ github.com/fumiama/go-docx v0.0.0-20250506085032-0c30fd09304b h1:/mxSugRc4SgN7Xg
github.com/fumiama/go-docx v0.0.0-20250506085032-0c30fd09304b/go.mod h1:ssRF0IaB1hCcKIObp3FkZOsjTcAHpgii70JelNb4H8M=
github.com/fumiama/imgsz v0.0.4 h1:Lsasu2hdSSFS+vnD+nvR1UkiRMK7hcpyYCC0FzgSMFI=
github.com/fumiama/imgsz v0.0.4/go.mod h1:bISOQVTlw9sRytPwe8ir7tAaEmyz9hSNj9n8mXMBG0E=
golang.org/x/image v0.34.0 h1:33gCkyw9hmwbZJeZkct8XyR11yH889EQt/QH4VmXMn8=
golang.org/x/image v0.34.0/go.mod h1:2RNFBZRB+vnwwFil8GkMdRvrJOFd1AzdZI6vOY+eJVU=
golang.org/x/image v0.42.0 h1:1gSs6ehNWXLbkHBIPcWztk3D/6aIA/8hauiAYtlodVY=
golang.org/x/image v0.42.0/go.mod h1:rrpelvGFt+kLPAjPM4HeWPgrl0FtafueU//e5N0qk/Q=
golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
Binary file not shown.
+1 -3
View File
@@ -17,10 +17,8 @@ import (
// Default endpoint configuration for the Articulate Rise API.
const (
// Root URL for the Articulate Rise API.
defaultBaseURL = "https://rise.articulate.com"
// Expected host for Articulate Rise share URLs.
riseHost = "rise.articulate.com"
defaultBaseURL = "https://" + riseHost
)
// shareIDRegex is compiled once at package init for extracting share IDs from URIs.