Skip to content

Commit d0edc88

Browse files
committed
fix: remove win file extension and use platform identifier in build workflow
1 parent b46ca3f commit d0edc88

File tree

3 files changed

+24
-20
lines changed

3 files changed

+24
-20
lines changed

.github/workflows/main.yml

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ jobs:
99
build-win:
1010
strategy:
1111
matrix:
12-
arch: [x64]
12+
platform: [win-x64]
1313
include:
14-
- arch: x64
14+
- platform: win-x64
15+
arch: x64
1516
os: windows-latest
1617
runs-on: ${{ matrix.os }}
1718
steps:
@@ -32,20 +33,22 @@ jobs:
3233
run: ./build/build-win.sh
3334
shell: bash
3435
- name: Add architecture to filename
35-
run: mv ./Builds/VisualStudio2022/${{ matrix.arch }}/Release/ConsoleApp/owlplug-scanner-${{ env.version }}-win.exe ./Builds/VisualStudio2022/${{ matrix.arch }}/Release/ConsoleApp/owlplug-scanner-${{ env.version }}-win-${{ matrix.arch }}.exe
36+
run: mv ./Builds/VisualStudio2022/${{ matrix.arch }}/Release/ConsoleApp/owlplug-scanner-${{ env.version }}-win.exe ./Builds/VisualStudio2022/${{ matrix.arch }}/Release/ConsoleApp/owlplug-scanner-${{ env.version }}-${{ matrix.platform }}
3637
- name: Upload Artifact
3738
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
3839
with:
39-
name: owlplug-scanner-win-${{ matrix.arch }}
40-
path: ./Builds/VisualStudio2022/${{ matrix.arch }}/Release/ConsoleApp/owlplug-scanner-${{ env.version }}-win-${{ matrix.arch }}.exe
40+
name: owlplug-scanner-${{ matrix.platform }}
41+
path: ./Builds/VisualStudio2022/${{ matrix.arch }}/Release/ConsoleApp/owlplug-scanner-${{ env.version }}-${{ matrix.platform }}
4142
build-osx:
4243
strategy:
4344
matrix:
44-
arch: [x64, arm64]
45+
platform: [osx-x64, osx-arm64]
4546
include:
46-
- arch: x64
47+
- platform: osx-x64
48+
arch: x64
4749
os: macos-15-intel
48-
- arch: arm64
50+
- platform: osx-arm64
51+
arch: arm64
4952
os: macos-15
5053
runs-on: ${{ matrix.os }}
5154
steps:
@@ -68,18 +71,19 @@ jobs:
6871
run: ./build/build-osx.sh
6972
shell: bash
7073
- name: Add architecture to filename
71-
run: mv ./Builds/MacOSX/build/Release/owlplug-scanner-${{ env.version }}-osx ./Builds/MacOSX/build/Release/owlplug-scanner-${{ env.version }}-osx-${{matrix.arch}}
74+
run: mv ./Builds/MacOSX/build/Release/owlplug-scanner-${{ env.version }}-osx ./Builds/MacOSX/build/Release/owlplug-scanner-${{ env.version }}-${{ matrix.platform }}
7275
- name: Upload Artifact
7376
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
7477
with:
75-
name: owlplug-scanner-osx-${{ matrix.arch }}
76-
path: ./Builds/MacOSX/build/Release/owlplug-scanner-${{ env.version }}-osx-${{ matrix.arch }}
78+
name: owlplug-scanner-${{ matrix.platform }}
79+
path: ./Builds/MacOSX/build/Release/owlplug-scanner-${{ env.version }}-osx-${{ matrix.platform }}
7780
build-linux:
7881
strategy:
7982
matrix:
80-
arch: [x64]
83+
platform: [linux-x64]
8184
include:
82-
- arch: x64
85+
- platform: linux-x64
86+
arch: x64
8387
os: ubuntu-24.04
8488
# Projucer is only distributed for x64/amd64 linux.
8589
# The projucer is required to generate the Makefile, but the build can be run for arm64 after that.
@@ -110,16 +114,16 @@ jobs:
110114
run: ./build/build-linux.sh
111115
shell: bash
112116
- name: Add version and architecture to filename
113-
run: mv ./Builds/LinuxMakefile/build/owlplug-scanner-linux ./Builds/LinuxMakefile/build/owlplug-scanner-${{ env.version }}-linux-${{matrix.arch}}
117+
run: mv ./Builds/LinuxMakefile/build/owlplug-scanner-linux ./Builds/LinuxMakefile/build/owlplug-scanner-${{ env.version }}-${{ matrix.platform }}
114118
- name: Upload Artifact
115119
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
116120
with:
117-
name: owlplug-scanner-linux-${{ matrix.arch }}
118-
path: ./Builds/LinuxMakefile/build/owlplug-scanner-${{ env.version }}-linux-${{ matrix.arch }}
121+
name: owlplug-scanner-${{ matrix.platform }}
122+
path: ./Builds/LinuxMakefile/build/owlplug-scanner-${{ env.version }}-${{ matrix.platform }}
119123
release:
120124
name: "Release"
121125
needs: [build-win, build-osx, build-linux]
122-
if: github.ref == 'refs/heads/master'
126+
# if: github.ref == 'refs/heads/master'
123127
runs-on: "ubuntu-latest"
124128
steps:
125129
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

JuceLibraryCode/JuceHeader.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ namespace ProjectInfo
4040
{
4141
const char* const projectName = "owlplug-scanner";
4242
const char* const companyName = "";
43-
const char* const versionString = "0.4.0";
44-
const int versionNumber = 0x400;
43+
const char* const versionString = "0.4.1";
44+
const int versionNumber = 0x401;
4545
}
4646
#endif

owlplug-scanner.jucer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<JUCERPROJECT id="yoeos4" name="owlplug-scanner" projectType="consoleapp" useAppConfig="0"
44
addUsingNamespaceToJuceHeader="0" displaySplashScreen="1" jucerFormatVersion="1"
5-
version="0.4.0" cppLanguageStandard="20">
5+
version="0.4.1" cppLanguageStandard="20">
66
<MAINGROUP id="JMs2NX" name="owlplug-scanner">
77
<GROUP id="{EE1B3A07-2402-FE08-C1B3-50215E94E56A}" name="Source">
88
<FILE id="NFqrO9" name="Main.cpp" compile="1" resource="0" file="Source/Main.cpp"/>

0 commit comments

Comments
 (0)