Skip to content

Commit 21eb412

Browse files
build(packaging): version number improvements
1 parent 5a40190 commit 21eb412

File tree

6 files changed

+10
-15
lines changed

6 files changed

+10
-15
lines changed

.github/workflows/ci-homebrew.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,33 +76,29 @@ jobs:
7676
run: |
7777
# variables for formula
7878
branch="${{ github.head_ref }}"
79+
build_version=${{ inputs.release_version }}
7980
commit=${{ inputs.release_commit }}
8081
8182
# check the branch variable
8283
if [ -z "$branch" ]
8384
then
8485
echo "This is a PUSH event"
85-
build_version=${{ inputs.release_tag }}
8686
clone_url=${{ github.event.repository.clone_url }}
8787
branch="${{ github.ref_name }}"
8888
default_branch="${{ github.event.repository.default_branch }}"
8989
9090
if [ "${{ matrix.release }}" == "true" ]; then
9191
# we will publish the formula with the release tag
9292
tag="${{ inputs.release_tag }}"
93-
version="${{ inputs.release_version }}"
9493
else
9594
tag="${{ github.ref_name }}"
96-
version="0.0.${{ github.run_number }}"
9795
fi
9896
else
9997
echo "This is a PR event"
100-
build_version="0.0.${{ github.event.number }}"
10198
clone_url=${{ github.event.pull_request.head.repo.clone_url }}
10299
branch="${{ github.event.pull_request.head.ref }}"
103100
default_branch="${{ github.event.pull_request.head.repo.default_branch }}"
104101
tag="${{ github.event.pull_request.head.ref }}"
105-
version="0.0.${{ github.event.number }}"
106102
fi
107103
echo "Branch: ${branch}"
108104
echo "Clone URL: ${clone_url}"
@@ -113,7 +109,6 @@ jobs:
113109
-B build \
114110
-S . \
115111
-DBUILD_VERSION="${build_version}" \
116-
-DFORMULA_VERSION="${version}" \
117112
-DGITHUB_BRANCH="${branch}" \
118113
-DGITHUB_COMMIT="${commit}" \
119114
-DGITHUB_CLONE_URL="${clone_url}" \

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
- name: Release Setup
4545
id: release-setup
46-
uses: LizardByte/actions/actions/release_setup@v2025.627.30023
46+
uses: LizardByte/actions/actions/release_setup@v2025.702.213340
4747
with:
4848
github_token: ${{ secrets.GITHUB_TOKEN }}
4949

docker/archlinux.dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ else
7474
sub_version=""
7575
fi
7676
cmake \
77-
-DSUNSHINE_CONFIGURE_PKGBUILD=ON \
78-
-DSUNSHINE_SUB_VERSION="${sub_version}" \
79-
-DGITHUB_CLONE_URL="${CLONE_URL}" \
77+
-DBUILD_VERSION=${BUILD_VERSION} \
8078
-DGITHUB_BRANCH=${BRANCH} \
81-
-DGITHUB_BUILD_VERSION=${BUILD_VERSION} \
79+
-DGITHUB_CLONE_URL="${CLONE_URL}" \
8280
-DGITHUB_COMMIT="${COMMIT}" \
8381
-DSUNSHINE_CONFIGURE_ONLY=ON \
82+
-DSUNSHINE_CONFIGURE_PKGBUILD=ON \
83+
-DSUNSHINE_SUB_VERSION="${sub_version}" \
8484
/build/sunshine
8585
_MAKE
8686

packaging/linux/Arch/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ prepare() {
6767

6868
build() {
6969
export BRANCH="@GITHUB_BRANCH@"
70-
export BUILD_VERSION="@GITHUB_BUILD_VERSION@"
70+
export BUILD_VERSION="@BUILD_VERSION@"
7171
export COMMIT="@GITHUB_COMMIT@"
7272

7373
export CC="gcc-${_gcc_version}"

packaging/linux/dev.lizardbyte.app.Sunshine.metainfo.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</description>
4141

4242
<releases>
43-
<release version="@PROJECT_VERSION@" date="@PROJECT_YEAR@-@PROJECT_MONTH@-@PROJECT_DAY@">
43+
<release version="@CMAKE_PROJECT_VERSION@" date="@PROJECT_YEAR@-@PROJECT_MONTH@-@PROJECT_DAY@">
4444
<description>
4545
<p>
4646
See the full changelog on GitHub

packaging/sunshine.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class @PROJECT_NAME@ < Formula
66
homepage "@PROJECT_HOMEPAGE_URL@"
77
url "@GITHUB_CLONE_URL@",
88
tag: "@GITHUB_TAG@"
9-
version "@FORMULA_VERSION@"
9+
version "@BUILD_VERSION@"
1010
license all_of: ["GPL-3.0-only"]
1111
head "@GITHUB_CLONE_URL@", branch: "@GITHUB_DEFAULT_BRANCH@"
1212

@@ -201,7 +201,7 @@ class @PROJECT_NAME@ < Formula
201201

202202
def install
203203
ENV["BRANCH"] = "@GITHUB_BRANCH@"
204-
ENV["BUILD_VERSION"] = "@BUILD_VERSION@"
204+
ENV["BUILD_VERSION"] = "v@BUILD_VERSION@"
205205
ENV["COMMIT"] = "@GITHUB_COMMIT@"
206206

207207
args = %W[

0 commit comments

Comments
 (0)