Merge pull request #13 from mutablelogic/ffmpeg61

Added workflow handlers

Author: djthorpe

.github/workflows/on_publish.yaml

@@ -0,0 +1,98 @@
+name: Build docker container on publish
+on:
+  release:
+    types: [ created, edited ]
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'tag'
+        required: true
+        default: 'latest'
+        type: string
+jobs:
+  var:
+    name: Set variables
+    runs-on: ubuntu-latest
+    outputs:
+      image: "ghcr.io/${{ github.repository }}"
+      tag: ${{ steps.var.outputs.tag }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set variables
+        id: var
+        run: |
+          if [ "${{ github.event_name }}" != "release" ] && [ "${{ inputs.tag }}" != "latest" ]; then
+            TAG="${{ inputs.tag }}" && echo "tag=${TAG#v}" >> $GITHUB_OUTPUT
+          else
+            TAG="$(git describe --tags)" && echo "tag=${TAG#v}" >> $GITHUB_OUTPUT
+          fi
+  build:
+    name: Build
+    needs: var
+    strategy:
+      matrix:
+        arch: [ amd64, arm64 ]
+    runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-latest' || matrix.arch }}
+    env:
+      ARCH: ${{ matrix.arch }}
+      OS: linux
+      DOCKER_REGISTRY: ghcr.io/mutablelogic
+    steps:
+      - name: Install git
+        run: |
+          sudo apt -y update
+          sudo apt -y install build-essential git
+          git config --global advice.detachedHead false
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Login
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and Push
+        id: build      
+        run: |
+          git checkout v${{ needs.var.outputs.tag }}
+          make docker && make docker-push
+  manifest:
+    name: Manifest
+    needs:
+      - var 
+      - build
+    strategy:
+      matrix:
+        include:
+          - tag: ${{ needs.var.outputs.tag }}
+          - tag: latest # TODO: Skip this if the event calling is not publishing a release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Login
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create
+        run: |
+          docker manifest create ${{ needs.var.outputs.image }}:${{ matrix.tag }} \
+            --amend ${{ needs.var.outputs.image }}-linux-amd64:${{ needs.var.outputs.tag }} \
+            --amend ${{ needs.var.outputs.image }}-linux-arm64:${{ needs.var.outputs.tag }}
+      - name: Annotate
+        run: |
+          docker manifest annotate --arch arm64 --os linux \
+            ${{ needs.var.outputs.image }}:${{ matrix.tag  }} \
+            ${{ needs.var.outputs.image }}-linux-arm64:${{ needs.var.outputs.tag }}
+          docker manifest annotate --arch amd64 --os linux \
+            ${{ needs.var.outputs.image }}:${{ matrix.tag  }} \
+            ${{ needs.var.outputs.image }}-linux-amd64:${{ needs.var.outputs.tag }}
+          docker manifest push ${{ needs.var.outputs.image }}:${{ matrix.tag }}
+      - name: Push
+        run: |
+          docker manifest push ${{ needs.var.outputs.image }}:${{ matrix.tag }}

.github/workflows/on_pull_request_merge.yaml

@@ -0,0 +1,43 @@
+
+name: "Run tests on merge to main"
+on:
+  pull_request:
+    branches: [ main ]
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]    
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go-version: [ '1.21', '1.22' ]  
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Setup Go ${{ matrix.go-version }}
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Run tests
+        run: make test

cmd/decode/main.go

@@ -6,7 +6,7 @@ import (
 	"os"
 
 	// Packages
-	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
+	ffmpeg "github.com/mutablelogic/go-media"
 )
 
 var (

cmd/server/handle_metadata.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	// Packages
-	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
+	ffmpeg "github.com/mutablelogic/go-media"
 	ff "github.com/mutablelogic/go-media/sys/ffmpeg61"
 )
 

go.mod

@@ -1,18 +1,25 @@
 module github.com/mutablelogic/go-media
 
-go 1.18
+go 1.22
+
+toolchain go1.22.4
 
 require (
-	github.com/djthorpe/go-errors v1.0.2
+	github.com/alecthomas/kong v0.9.0
+	github.com/djthorpe/go-errors v1.0.3
+	github.com/djthorpe/go-tablewriter v0.0.7
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/stretchr/testify v1.8.1
-	golang.org/x/exp v0.0.0-20221212164502-fae10dda9338
+	github.com/mutablelogic/go-client v1.0.8
+	github.com/stretchr/testify v1.9.0
 )
 
 require (
-	github.com/alecthomas/kong v0.9.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/term v0.20.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )