Skip to content

Commit

Permalink
Update github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
anbsky committed Nov 21, 2024
1 parent d58e7bf commit 81bdb4a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: FedericoCarboni/setup-ffmpeg@v2
- uses: FedericoCarboni/setup-ffmpeg@v3
- uses: actions/setup-go@v5
with:
go-version: '1.23'
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
id: release
run: |
echo "APP_NAME=$(git describe --tags|sed -e 's/\-v.*//')" >> $GITHUB_ENV
echo "APP_VERSION=$(git describe --tags --match 'api-v*'|sed 's/api-v\([0-9.]*\)/\1/')" >> $GITHUB_ENV
echo "APP_VERSION=$(git describe --tags --match '*-v*'|sed 's/.*v\([0-9.]*\).*/\1/')" >> $GITHUB_ENV
- name: Release details
run: |
Expand All @@ -102,10 +102,10 @@ jobs:
echo "::endgroup::"
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
username: ${{ vars.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

# odysee-api deployment

Expand Down
13 changes: 9 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
date := $(shell date "+%Y-%m-%d-%H-%M")
git_hash := $(shell git rev-parse --short HEAD)
oapi_version ?= $(shell git describe --tags --match 'api-v*'|sed 's/api-v\([0-9.]*\)/\1/')
watchman_version := $(shell git describe --tags --match 'watchman-v*'|sed 's/api-v\([0-9.]*\)/\1/')
forklift_version ?= $(shell git describe --tags --match 'forklift-v*'|sed 's/forklift-v\([0-9.]*\).*/\1/')
uploads_version ?= $(shell git describe --tags --match 'uploads-v*'|sed 's/uploads-v\([0-9.]*\).*/\1/')
oapi_version ?= $(shell git describe --tags --match 'api-v*'|sed 's/.*v\([0-9.]*\).*/\1/')
watchman_version := $(shell git describe --tags --match 'watchman-v*'|sed 's/.*v\([0-9.]*\).*/\1/')
forklift_version ?= $(shell git describe --tags --match 'forklift-v*'|sed 's/.*v\([0-9.]*\).*/\1/')
uploads_version ?= $(shell git describe --tags --match 'uploads-v*'|sed 's/.*v\([0-9.]*\).*/\1/')
go ?= go

.PHONY: versions
versions:
echo $(oapi_version)
echo $(watchman_version)

.PHONY: test
test:
$(go) test -cover ./...
Expand Down

0 comments on commit 81bdb4a

Please sign in to comment.