Skip to content

Commit eeaa627

Browse files
Oleksiy-YakovenkoOleksiy-Yakovenko
committed
github: implement automatic build number (displayed in about box); improved versioning / no patching plist; new upload path
1 parent eca2ef3 commit eeaa627

File tree

13 files changed

+178
-39
lines changed

13 files changed

+178
-39
lines changed

‎.github/workflows/linuxbuild.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
- name: Run Tests
2424
run: scripts/test.sh
2525
- name: Build for Linux
26-
run: TRAVIS_OS_NAME=linux travis/build.sh
26+
run: BUILD_OS_NAME=linux travis/build.sh
2727
- name: Upload for Linux
2828
env:
2929
gh_ed25519_key: ${{ secrets.GH_ENCRYPTED_ED25519_KEY }}
3030
gh_ed25519_iv: ${{ secrets.GH_ENCRYPTED_ED25519_IV }}
31-
run: TRAVIS_OS_NAME=linux travis/upload.sh
31+
run: BUILD_OS_NAME=linux travis/upload.sh
3232
- name: Upload artifact
3333
uses: actions/upload-artifact@v4
3434
with:

‎.github/workflows/linuxdebugbuild.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
- name: Run Tests
2424
run: scripts/test.sh
2525
- name: Build for Linux
26-
run: TRAVIS_OS_NAME=linux travis/build.sh --debug
26+
run: BUILD_OS_NAME=linux travis/build.sh --debug
2727
- name: Upload for Linux
2828
env:
2929
gh_ed25519_key: ${{ secrets.GH_ENCRYPTED_ED25519_KEY }}
3030
gh_ed25519_iv: ${{ secrets.GH_ENCRYPTED_ED25519_IV }}
31-
run: TRAVIS_OS_NAME=linux travis/upload.sh --debug
31+
run: BUILD_OS_NAME=linux travis/upload.sh --debug
3232
- name: Upload artifact
3333
uses: actions/upload-artifact@v4
3434
with:

‎.github/workflows/macbuild.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ jobs:
44
build_mac:
55
name: Mac Release Build
66
runs-on: macos-latest
7+
env:
8+
GITHUB_BUILD_NUMBER: ${{ github.run_number }}
79
steps:
810
- name: Checkout for macOS
911
uses: actions/checkout@v4
@@ -14,7 +16,7 @@ jobs:
1416
with:
1517
xcode-version: '16'
1618
- name: Build for macOS
17-
run: TRAVIS_OS_NAME=osx travis/build.sh
19+
run: BUILD_OS_NAME=osx travis/build.sh
1820
- name: Publish Test Results
1921
uses: EnricoMi/publish-unit-test-result-action/macos@v2
2022
if: always()
@@ -25,7 +27,7 @@ jobs:
2527
env:
2628
gh_ed25519_key: ${{ secrets.GH_ENCRYPTED_ED25519_KEY }}
2729
gh_ed25519_iv: ${{ secrets.GH_ENCRYPTED_ED25519_IV }}
28-
run: TRAVIS_OS_NAME=osx travis/upload.sh
30+
run: BUILD_OS_NAME=osx travis/upload.sh
2931
- name: Upload build artifact
3032
uses: actions/upload-artifact@v4
3133
with:

‎.github/workflows/windowsbuild.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ jobs:
2525
mingw-w64-x86_64-ffmpeg
2626
- name: Build for Windows
2727
shell: msys2 {0}
28-
run: TRAVIS_OS_NAME=windows travis/build.sh
28+
run: BUILD_OS_NAME=windows travis/build.sh
2929
- name: Upload for Windows
3030
env:
3131
gh_ed25519_key: ${{ secrets.GH_ENCRYPTED_ED25519_KEY }}
3232
gh_ed25519_iv: ${{ secrets.GH_ENCRYPTED_ED25519_IV }}
3333
shell: msys2 {0}
34-
run: TRAVIS_OS_NAME=windows travis/upload.sh
34+
run: BUILD_OS_NAME=windows travis/upload.sh
3535
- name: Upload artifact
3636
uses: actions/upload-artifact@v4
3737
with:

‎build_data/BUILD_NUMBER‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
local

‎build_data/BuildParameters.xcconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// This file is generated / updated when running CI build script
2+
3+
MARKETING_VERSION = 0.0.0
4+
BUILD_NUMBER = local

‎build_data/VERSION‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.10.1-alpha

‎osx/deadbeef.xcodeproj/project.pbxproj‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@
66
objectVersion = 54;
77
objects = {
88

9+
/* Begin PBXAggregateTarget section */
10+
2D3645AF2EB75FE800E7EA7A /* Setup Build Parameters */ = {
11+
isa = PBXAggregateTarget;
12+
buildConfigurationList = 2D3645B02EB75FE800E7EA7A /* Build configuration list for PBXAggregateTarget "Setup Build Parameters" */;
13+
buildPhases = (
14+
2D3645B32EB75FFC00E7EA7A /* Setup Build Parameters */,
15+
);
16+
dependencies = (
17+
);
18+
name = "Setup Build Parameters";
19+
packageProductDependencies = (
20+
);
21+
productName = "Setup Build Parameters";
22+
};
23+
/* End PBXAggregateTarget section */
24+
925
/* Begin PBXBuildFile section */
1026
07021F4F1C27365800FC9AF9 /* asm_arm.h in Headers */ = {isa = PBXBuildFile; fileRef = 07021F3D1C27365800FC9AF9 /* asm_arm.h */; };
1127
07021F501C27365800FC9AF9 /* codeclib_misc.h in Headers */ = {isa = PBXBuildFile; fileRef = 07021F3E1C27365800FC9AF9 /* codeclib_misc.h */; };
@@ -5697,6 +5713,10 @@
56975713
2D31044F2D7B51C300B2E846 /* Weakify.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Weakify.h; sourceTree = "<group>"; };
56985714
2D35A24A2B74D60F006D9356 /* filereader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = filereader.h; sourceTree = "<group>"; };
56995715
2D35A24B2B74D60F006D9356 /* filereader.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = filereader.c; sourceTree = "<group>"; };
5716+
2D3645A92EB74FD600E7EA7A /* ApplyVersion.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ApplyVersion.xcconfig; sourceTree = "<group>"; };
5717+
2D3645AB2EB7533300E7EA7A /* BUILD_NUMBER */ = {isa = PBXFileReference; lastKnownFileType = text; path = BUILD_NUMBER; sourceTree = "<group>"; };
5718+
2D3645AD2EB7539200E7EA7A /* VERSION */ = {isa = PBXFileReference; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
5719+
2D3645B82EB7613200E7EA7A /* BuildParameters.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = BuildParameters.xcconfig; sourceTree = "<group>"; };
57005720
2D3992DF25C2038700CFA936 /* WeakRefWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WeakRefWrapper.h; sourceTree = "<group>"; };
57015721
2D3992E025C2038700CFA936 /* WeakRefWrapper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WeakRefWrapper.m; sourceTree = "<group>"; };
57025722
2D3A4BB41D631530002C7098 /* medialib.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = medialib.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -9889,6 +9909,17 @@
98899909
path = dial68;
98909910
sourceTree = "<group>";
98919911
};
9912+
2D3645AC2EB7533300E7EA7A /* build_data */ = {
9913+
isa = PBXGroup;
9914+
children = (
9915+
2D3645B82EB7613200E7EA7A /* BuildParameters.xcconfig */,
9916+
2D3645AD2EB7539200E7EA7A /* VERSION */,
9917+
2D3645AB2EB7533300E7EA7A /* BUILD_NUMBER */,
9918+
);
9919+
name = build_data;
9920+
path = ../build_data;
9921+
sourceTree = SOURCE_ROOT;
9922+
};
98929923
2D4458DD1C04F1E400230939 /* vfs_zip */ = {
98939924
isa = PBXGroup;
98949925
children = (
@@ -11677,6 +11708,7 @@
1167711708
2DA9777324C5EC26002405DA /* xcodeconfig */ = {
1167811709
isa = PBXGroup;
1167911710
children = (
11711+
2D3645A92EB74FD600E7EA7A /* ApplyVersion.xcconfig */,
1168011712
2DC6565C2744287000583E14 /* gtk2.xcconfig */,
1168111713
2DA9777424C5EC26002405DA /* gtk3.xcconfig */,
1168211714
);
@@ -12675,6 +12707,7 @@
1267512707
4D1B3E7118379829003E6066 = {
1267612708
isa = PBXGroup;
1267712709
children = (
12710+
2D3645AC2EB7533300E7EA7A /* build_data */,
1267812711
2DA9777324C5EC26002405DA /* xcodeconfig */,
1267912712
2D92D19C29B9044300218F1D /* include */,
1268012713
2D92D18C29B9039A00218F1D /* src */,
@@ -16621,6 +16654,9 @@
1662116654
2D28F0541C283C75004A6E7B = {
1662216655
CreatedOnToolsVersion = 6.2;
1662316656
};
16657+
2D3645AF2EB75FE800E7EA7A = {
16658+
CreatedOnToolsVersion = 26.1;
16659+
};
1662416660
2D3A4BB31D631530002C7098 = {
1662516661
CreatedOnToolsVersion = 7.3.1;
1662616662
};
@@ -16856,6 +16892,7 @@
1685616892
2DF930431AB816DC0030C0CA /* wildmidi */,
1685716893
07021EAB1C2734AC00FC9AF9 /* wmalib */,
1685816894
07021F2F1C2734F100FC9AF9 /* wma */,
16895+
2D3645AF2EB75FE800E7EA7A /* Setup Build Parameters */,
1685916896
);
1686016897
};
1686116898
/* End PBXProject section */
@@ -17107,6 +17144,31 @@
1710717144
};
1710817145
/* End PBXResourcesBuildPhase section */
1710917146

17147+
/* Begin PBXShellScriptBuildPhase section */
17148+
2D3645B32EB75FFC00E7EA7A /* Setup Build Parameters */ = {
17149+
isa = PBXShellScriptBuildPhase;
17150+
buildActionMask = 2147483647;
17151+
files = (
17152+
);
17153+
inputFileListPaths = (
17154+
);
17155+
inputPaths = (
17156+
"$(SRCROOT)/../build_data/VERSION",
17157+
"$(SRCROOT)/../build_data/BUILD_NUMBER",
17158+
"$(SRCROOT)/scripts/setup_xcode_variables.sh",
17159+
);
17160+
name = "Setup Build Parameters";
17161+
outputFileListPaths = (
17162+
);
17163+
outputPaths = (
17164+
"$(SRCROOT)/../build_data/BuildParameters.xcconfig",
17165+
);
17166+
runOnlyForDeploymentPostprocessing = 0;
17167+
shellPath = /bin/sh;
17168+
shellScript = "${SRCROOT}/../scripts/setup_xcode_variables.sh\n";
17169+
};
17170+
/* End PBXShellScriptBuildPhase section */
17171+
1711017172
/* Begin PBXSourcesBuildPhase section */
1711117173
07021EAC1C2734AC00FC9AF9 /* Sources */ = {
1711217174
isa = PBXSourcesBuildPhase;
@@ -21861,6 +21923,22 @@
2186121923
};
2186221924
name = Release;
2186321925
};
21926+
2D3645B12EB75FE800E7EA7A /* Debug */ = {
21927+
isa = XCBuildConfiguration;
21928+
buildSettings = {
21929+
CODE_SIGN_STYLE = Automatic;
21930+
PRODUCT_NAME = "$(TARGET_NAME)";
21931+
};
21932+
name = Debug;
21933+
};
21934+
2D3645B22EB75FE800E7EA7A /* Release */ = {
21935+
isa = XCBuildConfiguration;
21936+
buildSettings = {
21937+
CODE_SIGN_STYLE = Automatic;
21938+
PRODUCT_NAME = "$(TARGET_NAME)";
21939+
};
21940+
name = Release;
21941+
};
2186421942
2D3A4BB61D631530002C7098 /* Debug */ = {
2186521943
isa = XCBuildConfiguration;
2186621944
buildSettings = {
@@ -24515,6 +24593,7 @@
2451524593
};
2451624594
4D1B3EA918379829003E6066 /* Debug */ = {
2451724595
isa = XCBuildConfiguration;
24596+
baseConfigurationReference = 2D3645A92EB74FD600E7EA7A /* ApplyVersion.xcconfig */;
2451824597
buildSettings = {
2451924598
ALWAYS_SEARCH_USER_PATHS = NO;
2452024599
CLANG_ANALYZER_DEADCODE_DEADSTORES = NO;
@@ -24575,6 +24654,7 @@
2457524654
};
2457624655
4D1B3EAA18379829003E6066 /* Release */ = {
2457724656
isa = XCBuildConfiguration;
24657+
baseConfigurationReference = 2D3645A92EB74FD600E7EA7A /* ApplyVersion.xcconfig */;
2457824658
buildSettings = {
2457924659
ALWAYS_SEARCH_USER_PATHS = NO;
2458024660
CLANG_ANALYZER_DEADCODE_DEADSTORES = NO;
@@ -25676,6 +25756,15 @@
2567625756
defaultConfigurationIsVisible = 0;
2567725757
defaultConfigurationName = Release;
2567825758
};
25759+
2D3645B02EB75FE800E7EA7A /* Build configuration list for PBXAggregateTarget "Setup Build Parameters" */ = {
25760+
isa = XCConfigurationList;
25761+
buildConfigurations = (
25762+
2D3645B12EB75FE800E7EA7A /* Debug */,
25763+
2D3645B22EB75FE800E7EA7A /* Release */,
25764+
);
25765+
defaultConfigurationIsVisible = 0;
25766+
defaultConfigurationName = Release;
25767+
};
2567925768
2D3A4BB51D631530002C7098 /* Build configuration list for PBXNativeTarget "medialib" */ = {
2568025769
isa = XCConfigurationList;
2568125770
buildConfigurations = (

‎osx/xcodeconfig/ApplyVersion.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../build_data/BuildParameters.xcconfig"

‎plugins/cocoaui/deadbeef-Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,11 @@
282282
<key>CFBundlePackageType</key>
283283
<string>APPL</string>
284284
<key>CFBundleShortVersionString</key>
285-
<string>devel</string>
285+
<string>$(MARKETING_VERSION)</string>
286286
<key>CFBundleSignature</key>
287287
<string>????</string>
288288
<key>CFBundleVersion</key>
289-
<string>1</string>
289+
<string>$(BUILD_NUMBER)</string>
290290
<key>LSApplicationCategoryType</key>
291291
<string>public.app-category.music</string>
292292
<key>LSEnvironment</key>

0 commit comments

Comments
 (0)