Skip to content

Commit 081adc8

Browse files
committed
fix release
1 parent cf66d15 commit 081adc8

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.github/workflows/auto-release.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
contents: write
1414

1515
steps:
16+
# This checks out the new tag, not the master branch. E.g. 'refs/tags/v26.2.12.0'
1617
- name: Check out the repository
1718
uses: actions/checkout@v6
1819
with:
@@ -26,14 +27,16 @@ jobs:
2627
- name: Commit changes
2728
uses: stefanzweifel/git-auto-commit-action@v7
2829
with:
30+
branch: master
2931
commit_message: Update version file
3032
commit_user_name: GitHub Actions
3133
commit_user_email: noreply@github.com
3234
commit_author: GitHub <noreply@github.com>
3335

3436
- name: "Create zip"
37+
shell: bash
3538
run: |
36-
make BRANCH=HEAD
39+
make BRANCH=HEAD VERSION="${{github.ref_name}}"
3740
3841
- name: "Create release"
3942
uses: softprops/action-gh-release@v2

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PACKAGE := subs2srs
44
# e.g. ~/.config/mpv/ or $pkgdir/etc/mpv when using PKGBUILD
55
PREFIX ?= $(HOME)/.config/mpv
66
BRANCH ?= master
7-
VERSION := $(shell git describe --tags $(BRANCH))
7+
VERSION ?= $(shell git describe --tags $(BRANCH))
88
RELEASE_DIR := .github/RELEASE
99
ZIP := $(RELEASE_DIR)/$(PROJECT)_$(VERSION).zip
1010
DOCS := $(RELEASE_DIR)/README_$(VERSION).html

0 commit comments

Comments
 (0)