Update .github/workflows/release.yml

Change how BUILD_TIME is derived Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Update dependency-review.yml
2026-01-16 08:22:09 +01:00 · 2025-05-29 01:13:59 +02:00 · 2025-05-29 01:11:06 +02:00 · 2025-05-28 23:03:19 +00:00 · 2025-05-29 00:19:25 +02:00 · 2025-05-28 23:50:54 +02:00
5 changed files with 111 additions and 161 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -3,8 +3,6 @@ name: CI
 on:
  push:
    branches: ['master', 'develop']
-    tags:
-      - 'v*.*.*'
  pull_request:
    branches: ['master', 'develop', 'feature/*']

@ -38,19 +36,6 @@ jobs:
        with:
          go-version: ${{ matrix.go }}
          check-latest: true
-          # Disable built-in cache to use our custom cache
-          cache: false
-
-      - name: Cache Go modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ matrix.go }}-${{ hashFiles('**/go.sum', '**/go.mod') }}-v1
-          restore-keys: |
-            ${{ runner.os }}-go-${{ matrix.go }}-
-        continue-on-error: true

      - name: Download dependencies with retry
        run: |
@ -61,10 +46,10 @@ jobs:
          download_with_retry() {
            local attempt=1
            local max_attempts=3
-            
+
            while [ $attempt -le $max_attempts ]; do
              echo "Attempt $attempt of $max_attempts"
-              
+
              if go mod download; then
                echo "Download successful on attempt $attempt"
                return 0
@ -79,7 +64,7 @@ jobs:
                attempt=$((attempt + 1))
              fi
            done
-            
+
            echo "All download attempts failed"
            return 1
          }
@ -184,7 +169,7 @@ jobs:

            # Create temporary file for package coverage aggregation
            temp_coverage=$(mktemp)
-            
+
            # Extract package-level coverage data
            go tool cover -func=coverage.out | grep -v total | while read line; do
              if [[ $line == *".go:"* ]]; then
@ -192,28 +177,28 @@ jobs:
                filepath=$(echo "$line" | awk '{print $1}')
                pkg_path=$(dirname "$filepath" | sed 's|github.com/kjanat/articulate-parser/||' | sed 's|^\./||')
                coverage=$(echo "$line" | awk '{print $3}' | sed 's/%//')
-                
+
                # Use root package if no subdirectory
                if [[ "$pkg_path" == "." || "$pkg_path" == "" ]]; then
                  pkg_path="root"
                fi
-                
+
                echo "$pkg_path $coverage" >> "$temp_coverage"
              fi
            done
-            
+
            # Aggregate coverage by package (average)
            awk '{
-              packages[$1] += $2; 
+              packages[$1] += $2;
              counts[$1]++
-            } 
+            }
            END {
              for (pkg in packages) {
                avg = packages[pkg] / counts[pkg]
                printf "| %s | %.1f%% |\n", pkg, avg
              }
            }' $temp_coverage | sort >> $GITHUB_STEP_SUMMARY
-            
+
            rm -f $temp_coverage

            echo "</details>" >> $GITHUB_STEP_SUMMARY
@ -365,135 +350,7 @@ jobs:
          fail-on-severity: moderate
          comment-summary-in-pr: always

-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    if: github.ref_type == 'tag'
-    permissions:
-      contents: write
-    needs: ['test']
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0

-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: 'go.mod'
-          check-latest: true
-
-      - name: Run tests
-        run: |
-          echo "## 🚀 Release Tests" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-
-          go test -v ./... 2>&1 | tee release-test-output.log
-          TEST_STATUS=$?
-
-          TOTAL_TESTS=$(grep -c "=== RUN" release-test-output.log || echo "0")
-          PASSED_TESTS=$(grep -c "--- PASS:" release-test-output.log || echo "0")
-          FAILED_TESTS=$(grep -c "--- FAIL:" release-test-output.log || echo "0")
-
-          echo "| Metric | Value |" >> $GITHUB_STEP_SUMMARY
-          echo "|--------|-------|" >> $GITHUB_STEP_SUMMARY
-          echo "| Total Tests | $TOTAL_TESTS |" >> $GITHUB_STEP_SUMMARY
-          echo "| Passed | ✅ $PASSED_TESTS |" >> $GITHUB_STEP_SUMMARY
-          echo "| Failed | ❌ $FAILED_TESTS |" >> $GITHUB_STEP_SUMMARY
-          echo "| Status | $([ $TEST_STATUS -eq 0 ] && echo "✅ PASSED" || echo "❌ FAILED") |" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-
-          exit $TEST_STATUS
-
-      - name: Install UPX
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y upx
-
-      - name: Build binaries
-        run: |
-          echo "## 🔨 Build Process" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-
-          # Set the build time environment variable using git commit timestamp
-          BUILD_TIME=$(git log -1 --format=%cd --date=iso-strict)
-
-          # Add run permissions to the build script
-          chmod +x ./scripts/build.sh
-
-          # Display help information for the build script
-          ./scripts/build.sh --help
-
-          echo "**Build Configuration:**" >> $GITHUB_STEP_SUMMARY
-          echo "- Version: ${{ github.ref_name }}" >> $GITHUB_STEP_SUMMARY
-          echo "- Build Time: $BUILD_TIME" >> $GITHUB_STEP_SUMMARY
-          echo "- Git Commit: ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-
-          # Build for all platforms
-          ./scripts/build.sh \
-            --verbose \
-            -ldflags "-s -w -X github.com/kjanat/articulate-parser/internal/version.Version=${{ github.ref_name }} -X github.com/kjanat/articulate-parser/internal/version.BuildTime=$BUILD_TIME -X github.com/kjanat/articulate-parser/internal/version.GitCommit=${{ github.sha }}"
-
-      - name: Compress binaries with UPX
-        run: |
-          echo "## 📦 Binary Compression" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-
-          echo "Compressing binaries with UPX..."
-          cd build/
-
-          # Get original sizes
-          echo "**Original sizes:**" >> $GITHUB_STEP_SUMMARY
-          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-          ls -lah >> $GITHUB_STEP_SUMMARY
-          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-
-          # Compress all binaries except Darwin (macOS) binaries as UPX doesn't work well with recent macOS versions
-          for binary in articulate-parser-*; do
-            echo "Compressing $binary..."
-            upx --best "$binary" || {
-              echo "Warning: UPX compression failed for $binary, keeping original"
-            }
-
-            # if [[ "$binary" == *"darwin"* ]]; then
-            #   echo "Skipping UPX compression for $binary (macOS compatibility)"
-            # else
-            #   echo "Compressing $binary..."
-            #   upx --best "$binary" || { # removed `--lzma`
-            #     echo "Warning: UPX compression failed for $binary, keeping original"
-            #   }
-            # fi
-          done
-
-          echo "**Final sizes:**" >> $GITHUB_STEP_SUMMARY
-          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-          ls -lah >> $GITHUB_STEP_SUMMARY
-          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: build-artifacts
-          path: build/
-          if-no-files-found: ignore
-          retention-days: 1
-          compression-level: 9
-          overwrite: true
-          include-hidden-files: true
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: build/*
-          generate_release_notes: true
-          draft: false
-          # Mark v0.x.x releases as prerelease (pre-1.0 versions are considered unstable)
-          prerelease: ${{ startsWith(github.ref, 'refs/tags/v0.') }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

  docker:
    name: Docker Build & Push
@ -502,13 +359,16 @@ jobs:
      contents: read
      packages: write
    needs: ['test']
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/feature/docker'))
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/feature/docker'))
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4

-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Log in to GitHub Container Registry
        uses: docker/login-action@v3
@ -517,11 +377,19 @@ jobs:
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
      - name: Extract metadata
        id: meta
        uses: docker/metadata-action@v5
        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: |
+            ${{ env.IMAGE_NAME }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
          tags: |
            type=ref,event=branch
            type=semver,pattern={{version}}
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@ -10,6 +10,7 @@ permissions:
  contents: read
  # Required to post security advisories
  security-events: write
+  pull-requests: write

 jobs:
  dependency-review:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -4,9 +4,15 @@ on:
  push:
    tags:
      - 'v*.*.*'
+  workflow_call:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}

 permissions:
  contents: write
+  packages: write

 jobs:
  release:
@ -72,3 +78,79 @@ jobs:
          prerelease: ${{ startsWith(github.ref, 'refs/tags/v0.') }}
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  docker:
+    name: Docker Build & Push
+    runs-on: ubuntu-latest
+    needs: ['release']
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.IMAGE_NAME }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=raw,value=latest,enable={{is_default_branch}}
+          labels: |
+            org.opencontainers.image.title=Articulate Parser
+            org.opencontainers.image.description=A powerful CLI tool to parse Articulate Rise courses and export them to multiple formats including Markdown HTML and DOCX. Supports media extraction content cleaning and batch processing for educational content conversion.
+            org.opencontainers.image.vendor=kjanat
+            org.opencontainers.image.licenses=MIT
+            org.opencontainers.image.url=https://github.com/${{ github.repository }}
+            org.opencontainers.image.source=https://github.com/${{ github.repository }}
+            org.opencontainers.image.documentation=https://github.com/${{ github.repository }}/blob/master/DOCKER.md
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          platforms: |
+            linux/amd64
+            linux/arm64
+            linux/arm/v7
+            linux/386
+            linux/ppc64le
+            linux/s390x
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          annotations: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            VERSION=${{ github.ref_name }}
+            BUILD_TIME=${{ github.event.head_commit.timestamp || github.event.repository.pushed_at }}
+            GIT_COMMIT=${{ github.sha }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=A powerful CLI tool to parse Articulate Rise courses and export them to multiple formats including Markdown HTML and DOCX. Supports media extraction content cleaning and batch processing for educational content conversion.
+          sbom: true
+          provenance: true
--- a/README.md
+++ b/README.md
@ -9,10 +9,9 @@ A Go-based parser that converts Articulate Rise e-learning content to various fo
 [![License](https://img.shields.io/github/license/kjanat/articulate-parser?label=License)][MIT License] <!-- [![Commit activity](https://img.shields.io/github/commit-activity/m/kjanat/articulate-parser?label=Commit%20activity)][Commits] -->
 [![Last commit](https://img.shields.io/github/last-commit/kjanat/articulate-parser?label=Last%20commit)][Commits]
 [![GitHub Issues or Pull Requests](https://img.shields.io/github/issues/kjanat/articulate-parser?label=Issues)][Issues]
-[![CI](https://img.shields.io/github/actions/workflow/status/kjanat/articulate-parser/ci.yml?logo=github&label=CI)][Build]
+[![Docker Image](https://img.shields.io/badge/docker-ghcr.io-blue?logo=docker&logoColor=white)][Docker image] <!-- [![Docker Size](https://img.shields.io/docker/image-size/kjanat/articulate-parser?logo=docker&label=Image%20Size)][Docker image] -->
 [![Docker](https://img.shields.io/github/actions/workflow/status/kjanat/articulate-parser/docker.yml?logo=docker&label=Docker)][Docker workflow]
-[![Docker Image](https://img.shields.io/badge/docker-ghcr.io-blue?logo=docker&logoColor=white)][Docker image]
-[![Docker Size](https://img.shields.io/docker/image-size/kjanat/articulate-parser?logo=docker&label=Image%20Size)][Docker image]
+[![CI](https://img.shields.io/github/actions/workflow/status/kjanat/articulate-parser/ci.yml?logo=github&label=CI)][Build]
 [![Codecov](https://img.shields.io/codecov/c/gh/kjanat/articulate-parser?token=eHhaHY8nut&logo=codecov&logoColor=%23F01F7A&label=Codecov)][Codecov]

 ## System Architecture
--- a/internal/version/version.go
+++ b/internal/version/version.go
@ -5,7 +5,7 @@ package version
 // Version information.
 var (
 	// Version is the current version of the application.
-	Version = "0.4.0"
+	Version = "0.4.1"

 	// BuildTime is the time the binary was built.
 	BuildTime = "unknown"
Author	SHA1	Message	Date
Kaj Kowalski	2e887a2b31	Update .github/workflows/release.yml Change how BUILD_TIME is derived Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-05-29 01:13:59 +02:00
Kaj Kowalski	cdc9815cee	Update dependency-review.yml Added permission to add pull-request comments	2025-05-29 01:11:06 +02:00
Your Name	c4086a832f	fix: prevent duplicate workflow execution on tag push - Remove tag trigger from CI workflow to prevent simultaneous execution - Add Docker build job to release workflow for proper release handling - CI now only runs on branch pushes and PRs - Release workflow handles both binary releases and Docker images for tags Fixes issue where both CI and release workflows would start when pushing vX.X.X tags	2025-05-28 23:03:19 +00:00
Kaj Kowalski	903ee92e4c	Update ci.yml - Added docker hub to the login. - Removed some cache BS.	2025-05-29 00:19:25 +02:00
Kaj Kowalski	9c51c0d9e3	Reorganizes badges in README for clarity Switches CI and Docker badges to clarify workflow separation. Promotes Docker image visibility by rearranging badge positions.	2025-05-28 23:50:54 +02:00