Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
node-version: [ '20.x' ]
go-version: [ '1.21', '1.22']
go-version: [ '1.22', '1.23' ]

steps:
- uses: actions/checkout@v3
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ '3.10' ]
python-version: [ '3.11' ]

steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: '1.21'
go-version: '1.23'
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
Expand All @@ -37,6 +37,9 @@ jobs:
restore-keys: |
${{ runner.os }}-pip-cache-oerc

- name: Install libraries
run: sudo apt-get install -y docker-compose

- name: Build oerc and startup server
run: |
make setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: '1.21'
go-version: '1.23'
- name: Linting
run: |
go install github.com/mgechev/revive@latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
node-version: [ '20.x' ]
python-version: [ '3.11' ]
go-version: [ '1.21', '1.22' ]
go-version: [ '1.22', '1.23' ]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ header:
copyright-owner: Emschu emschu[aet]mailbox.org
content: |
oerc, alias oer-collector
Copyright (C) 2021-2023 emschu[aet]mailbox.org
Copyright (C) 2021-2024 emschu[aet]mailbox.org

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
Expand Down
5 changes: 5 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog oerc

## 0.17.0 - 2024/12/26
- Golang 1.23, toolchain and dependency updates
- Changed fetching ARD program information using new ARD program and tv show API
- Completely new ard channels (the former ones get deprecated during first startup)

## 0.16.0 - 2024/07/04
- Golang 1.21
- Dependency update
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# oerc, alias oer-collector
# Copyright (C) 2021-2023 emschu[aet]mailbox.org
# Copyright (C) 2021-2024 emschu[aet]mailbox.org
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand All @@ -17,7 +17,7 @@
# If not, see <https://www.gnu.org/licenses/>.

# Build
FROM golang:1.21-alpine as build
FROM golang:1.23-alpine as build
RUN mkdir /app
WORKDIR /app
COPY go.mod ./
Expand All @@ -27,7 +27,7 @@ COPY . ./project
RUN cd ./project && go build -o /app/oerc


FROM golang:1.21-alpine
FROM golang:1.23-alpine
MAINTAINER emschu <emschu@mailbox.org>
RUN mkdir /app && apk add --no-cache tzdata;
WORKDIR /app
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# oerc, alias oer-collector
# Copyright (C) 2021-2023 emschu[aet]mailbox.org
# Copyright (C) 2021-2024 emschu[aet]mailbox.org
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
Expand All @@ -17,8 +17,8 @@
# If not, see <https://www.gnu.org/licenses/>.
SHELL := /bin/bash

APP_VERSION_DOT = "0.16.0"
APP_VERSION_STR = "0-16-0"
APP_VERSION_DOT = "0.17.0"
APP_VERSION_STR = "0-17-0"

GO := GO111MODULE=on go
GO_PATH = $(shell $(GO) env GOPATH)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ USAGE:
oerc [global options] command [command options] [arguments...]

VERSION:
0.16.0, License: AGPLv3, https://github.com/emschu/oerc
0.17.0, License: AGPLv3, https://github.com/emschu/oerc

DESCRIPTION:
Fetch, view and search TV program data of public-law stations in Germany, Switzerland and Austria
Expand Down
Loading