Merge dev into master

.github/workflows/go-2.yml

@@ -0,0 +1,117 @@
+on:
+ push:
+ # Sequence of patterns matched against refs/tags
+ tags:
+ - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+name: Latest Release
+
+defaults:
+ run:
+ shell: bash
+
+jobs:
+ lint:
+ name: Lint files
+ runs-on: 'ubuntu-latest'
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-go@v2
+ with:
+ go-version: '1.20'
+ - name: golangci-lint
+ uses: golangci/golangci-lint-action@v2.5.2
+ with:
+ version: latest
+ test:
+ name: Run tests
+ runs-on: 'ubuntu-latest'
+ needs: lint
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-go@v2
+ with:
+ go-version: '1.20'
+ - run: go test -v -cover
+ release:
+ name: Create Release
+ runs-on: 'ubuntu-latest'
+ needs: test
+ strategy:
+ matrix:
+ goosarch:
+ # - 'aix/ppc64'
+ # - 'android/386'
+ # - 'android/amd64'
+ # - 'android/arm'
+ # - 'android/arm64'
+ - 'darwin/amd64'
+ - 'darwin/arm64'
+ # - 'dragonfly/amd64'
+ # - 'freebsd/386'
+ # - 'freebsd/amd64'
+ # - 'freebsd/arm'
+ # - 'freebsd/arm64'
+ # - 'illumos/amd64'
+ # - 'ios/amd64'
+ # - 'ios/arm64'
+ # - 'js/wasm'
+ # - 'linux/386'
+ - 'linux/amd64'
+ # - 'linux/arm'
+ - 'linux/arm64'
+ # - 'linux/mips'
+ # - 'linux/mips64'
+ # - 'linux/mips64le'
+ # - 'linux/mipsle'
+ # - 'linux/ppc64'
+ # - 'linux/ppc64le'
+ # - 'linux/riscv64'
+ # - 'linux/s390x'
+ # - 'netbsd/386'
+ # - 'netbsd/amd64'
+ # - 'netbsd/arm'
+ # - 'netbsd/arm64'
+ # - 'openbsd/386'
+ # - 'openbsd/amd64'
+ # - 'openbsd/arm'
+ # - 'openbsd/arm64'
+ # - 'openbsd/mips64'
+ # - 'plan9/386'
+ # - 'plan9/amd64'
+ # - 'plan9/arm'
+ # - 'solaris/amd64'
+ # - 'windows/386'
+ - 'windows/amd64'
+ - 'windows/arm'
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ - uses: actions/setup-go@v2
+ with:
+ go-version: '1.20'
+ - name: Get OS and arch info
+ run: |
+ GOOSARCH=${{matrix.goosarch}}
+ GOOS=${GOOSARCH%/*}
+ GOARCH=${GOOSARCH#*/}
+ BINARY_NAME=${{github.repository}}-$GOOS-$GOARCH
+ echo "BINARY_NAME=$BINARY_NAME" >> $GITHUB_ENV
+ echo "GOOS=$GOOS" >> $GITHUB_ENV
+ echo "GOARCH=$GOARCH" >> $GITHUB_ENV
+ - name: Build
+ run: |
+ go build -o "$BINARY_NAME" -v
+ - name: Release Notes
+ run:
+ git log $(git describe HEAD~ --tags --abbrev=0)..HEAD --pretty='format:* %h %s%n * %an <%ae>' --no-merges >> ".github/RELEASE-TEMPLATE.md"
+ - name: Release with Notes
+ uses: softprops/action-gh-release@v1
+ with:
+ body_path: ".github/RELEASE-TEMPLATE.md"
+ draft: true
+ files: ${{env.BINARY_NAME}}
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/go.yml

@@ -0,0 +1,28 @@
+# This workflow will build a golang project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
+
+name: Build Telly
+
+on:
+ push:
+ branches: [ "dev" ]
+ pull_request:
+ branches: [ "dev" ]
+
+jobs:
+
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Set up Go
+ uses: actions/setup-go@v4
+ with:
+ go-version: '1.20'
+
+ - name: Build
+ run: go build -v ./...
+
+ - name: Test
+ run: go test -v ./...

.gitignore

@@ -4,9 +4,13 @@ telly
 .DS_Store
 /.GOPATH
 /bin
-*.xml
+/*.xml
 vendor/
 /.build
 /.release
 /.tarballs
 *.tar.gz
+telly.config.*
+.idea/*
+telly.db
+a_main-packr.go

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "frontend"]
+ path = frontend
+ url = https://github.com/tellytv/frontend.git

.promu.yml

@@ -1,14 +1,25 @@
 repository:
-  path: github.com/tellytv/telly
+ path: github.com/tellytv/telly
 build:
-  flags: -a -tags netgo
-  ldflags: |
-  -X {{repoPath}}/vendor/github.com/prometheus/common/version.Version={{.Version}}
-  -X {{repoPath}}/vendor/github.com/prometheus/common/version.Revision={{.Revision}}
-  -X {{repoPath}}/vendor/github.com/prometheus/common/version.Branch={{.Branch}}
-  -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
-  -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
+ flags: -a -tags netgo
+ ldflags: |
+ -X github.com/prometheus/common/version.Version={{.Version}}
+ -X github.com/prometheus/common/version.Revision={{.Revision}}
+ -X github.com/prometheus/common/version.Branch={{.Branch}}
+ -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
+ -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
 tarball:
- files:
- - LICENSE
- - NOTICE
+ files:
+ - LICENSE
+ - NOTICE
+crossbuild:
+ platforms:
+ - linux/386
+ - linux/amd64
+ - linux/arm
+ - linux/arm64
+ - darwin/amd64
+ - windows/amd64
+ - windows/386
+ - freebsd/amd64
+ - freebsd/386

Dockerfile

@@ -1,26 +1,6 @@
-FROM golang:alpine as builder
-
-# Download and install the latest release of dep
-ADD https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 /usr/bin/dep
-RUN chmod +x /usr/bin/dep
-
-# Install git because gin/yaml needs it
-RUN apk update && apk upgrade && apk add git
-
-# Copy the code from the host and compile it
-WORKDIR $GOPATH/src/github.com/tellytv/telly
-COPY Gopkg.toml Gopkg.lock ./
-RUN dep ensure --vendor-only
-COPY . ./
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix nocgo -o /app .
-
-# install ca root certificates + listen on 0.0.0.0 + build
-RUN apk add --no-cache ca-certificates \
- && find . -type f -print0 | xargs -0 sed -i 's/"listen", "localhost/"listen", "0.0.0.0/g' \
- && CGO_ENABLED=0 GOOS=linux go install -ldflags '-w -s -extldflags "-static"'
-
 FROM scratch
-COPY --from=builder /app ./
-COPY --from=builder /etc/ssl/certs/ /etc/ssl/certs/
+COPY .build/linux-amd64/telly ./app
 EXPOSE 6077
 ENTRYPOINT ["./app"]
+
+

Dockerfile.ffmpeg

@@ -0,0 +1,4 @@
+FROM jrottenberg/ffmpeg:4.0-alpine
+COPY --from=tellytv/telly:dev /app /app
+EXPOSE 6077
+ENTRYPOINT ["/app"]