Merge 0400476f0b into 31c8ee518a

🤷

.github/workflows/always.yml

@@ -6,20 +6,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
+    - name: Checkout code
+      uses: actions/checkout@v4
+
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v5
       with:
-        go-version: 1.19.1
+        go-version: 1.23.0
       id: go
 
-    - name: deps
-      run: npm i -g standard
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v1
-      with:
-        submodules: true
-
     - name: Run
       run: make ci
 

.github/workflows/deploy.yml

@@ -10,33 +10,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v1
-      with:
-        submodules: true
-
-    - name: Set up Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.19.1
-      id: go
+      uses: actions/checkout@v4
 
     - name: Set env
       run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1.2.0
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1.6.0
+      uses: docker/setup-qemu-action@v3
 
     - name: Login to DockerHub
-      uses: docker/login-action@v1.10.0
+      uses: docker/login-action@v3
       with:
         username: ${{ secrets.DOCKER_USER }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
     - name: Build and release on dockerhub
-      uses: docker/build-push-action@v2.7.0
+      uses: docker/build-push-action@v6
       with:
         file: support/build.Dockerfile
         push: true
@@ -47,17 +39,19 @@ jobs:
       run: make build-all
 
     - name: "Release gh release versioned"
-      uses: ncipollo/release-action@58ae73b360456532aafd58ee170c045abbeaee37
+      uses: ncipollo/release-action@v1
       with:
         allowUpdates: true
         artifacts: "builds/*"
+        bodyFile: "builds/buildout"
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: "Release gh release latest"
-      uses: ncipollo/release-action@58ae73b360456532aafd58ee170c045abbeaee37
+      uses: ncipollo/release-action@v1
       with:
         tag: latest
         name: Latest
         allowUpdates: true
         artifacts: "builds/*"
+        bodyFile: "builds/buildout"
         token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/rc.yml

@@ -1,39 +0,0 @@
-name: rc
-
-on:
-  push:
-    branches:
-      - 'rc/**'
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Set up Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.19.1
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v1
-      with:
-        submodules: true
-
-    - name: Run
-      run: make ci
-
-    - name: Build all artifacts
-      run: make build-all
-
-    - name: "Release gh release prerelease"
-      uses: ncipollo/release-action@58ae73b360456532aafd58ee170c045abbeaee37
-      with:
-        allowUpdates: true
-        prerelease: true
-        tag: "rc"
-        artifacts: "builds/*"
-        token: ${{ secrets.GITHUB_TOKEN }}
-

Makefile

@@ -1,4 +1,4 @@
-FLAGS := -ldflags "-s -w" -trimpath
+FLAGS := -trimpath
 NOCGO := CGO_ENABLED=0
 
 build::
@@ -17,10 +17,7 @@ run-ro::
 run-extra::
 	./gossa -verb=true -prefix="/fancy-path/" -k=false -symlinks=true test-fixture
 
-lint-js::
-	standard
-
-ci:: build-all test lint-js
+ci:: build-all test
 	echo "done"
 
 test::
@@ -59,13 +56,14 @@ watch-test::
 	ls gossa.go gossa_test.go ui/* | entr -rc make test
 
 build-all:: build
-	${NOCGO}  GOOS=linux    GOARCH=amd64  go build ${FLAGS} -o builds/gossa-linux-x64
-	${NOCGO}  GOOS=linux    GOARCH=arm    go build ${FLAGS} -o builds/gossa-linux-arm
-	${NOCGO}  GOOS=linux    GOARCH=arm64  go build ${FLAGS} -o builds/gossa-linux-arm64
-	${NOCGO}  GOOS=darwin   GOARCH=amd64  go build ${FLAGS} -o builds/gossa-mac-x64
-	${NOCGO}  GOOS=darwin   GOARCH=arm64  go build ${FLAGS} -o builds/gossa-mac-arm64
-	${NOCGO}  GOOS=windows  GOARCH=amd64  go build ${FLAGS} -o builds/gossa-windows.exe
-	sha256sum builds/*
+	go version
+	${NOCGO} GOOS=linux   GOARCH=amd64 go build ${FLAGS} -o builds/gossa-linux-x64
+	${NOCGO} GOOS=linux   GOARCH=arm   go build ${FLAGS} -o builds/gossa-linux-arm
+	${NOCGO} GOOS=linux   GOARCH=arm64 go build ${FLAGS} -o builds/gossa-linux-arm64
+	${NOCGO} GOOS=darwin  GOARCH=amd64 go build ${FLAGS} -o builds/gossa-mac-x64
+	${NOCGO} GOOS=darwin  GOARCH=arm64 go build ${FLAGS} -o builds/gossa-mac-arm64
+	${NOCGO} GOOS=windows GOARCH=amd64 go build ${FLAGS} -o builds/gossa-windows.exe
+	sha256sum builds/* | tee builds/buildout
 
 clean::
 	rm -f gossa

go.mod

@@ -1,3 +1,3 @@
 module github.com/pldubouilh/gossa
 
-go 1.16
+go 1.23.0

readme.md

@@ -29,7 +29,9 @@ a simple UI comes as default, featuring :
 
 [nix](https://search.nixos.org/packages?channel=unstable&show=gossa&from=0&size=50&sort=relevance&type=packages&query=gossa) - e.g. `nix-shell -p gossa`
 
-binaries are available on the [release page](https://github.com/pldubouilh/gossa/releases) - or simply `make build` this repo.
+[mpr](https://mpr.makedeb.org/packages/gossa)
+
+binaries are available on the [release page](https://github.com/pldubouilh/gossa/releases)
 
 all builds are reproducible, checkout the hashes on the release page.
 

support/build.Dockerfile

@@ -1,4 +1,5 @@
-FROM golang:1.18 as builder
+FROM docker.io/library/golang:1.23.0-alpine AS builder
+RUN apk add --no-cache make
 WORKDIR /gossaSrc
 COPY . /gossaSrc
 RUN make

ui/script.js

@@ -582,7 +582,7 @@ picsHolder.addEventListener('touchend', e => {
 }, false)
 
 // Video player
-const videosTypes = ['.mp4', '.webm', '.ogv', '.ogg', '.mp3', '.flac', '.wav']
+const videosTypes = ['.mkv', '.mp4', '.webm', '.ogv', '.ogg', '.mp3', '.flac', '.wav']
 const isVideo = src => src && videosTypes.find(type => src.toLocaleLowerCase().includes(type))
 const isVideoMode = () => video.style.display === 'flex'
 const videoFs = () => video.requestFullscreen()