Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/buildcheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

# We need to build/link Poco ourselves as static libraries, because Ubuntu Jammy ships with a broken Poco 1.11.0
- name: Checkout Poco Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: pocoproject/poco
path: poco
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
cmake --install "${{ github.workspace }}/cmake-build-poco"

- name: Checkout libprojectM Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: projectM-visualizer/projectm
path: projectm
Expand All @@ -65,7 +65,7 @@ jobs:
cmake --install "${{ github.workspace }}/cmake-build-libprojectm"

- name: Checkout frontend-sdl2 Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
path: frontend-sdl2
submodules: recursive
Expand All @@ -85,7 +85,7 @@ jobs:
cpack -G DEB

- name: Upload Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: projectMSDL-buildcheck-linux
path: cmake-build-frontend-sdl2/*.deb
Expand All @@ -102,7 +102,7 @@ jobs:

steps:
- name: Checkout vcpkg
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: microsoft/vcpkg
path: vcpkg
Expand All @@ -127,7 +127,7 @@ jobs:
-Source "${{ env.FEED_URL }}"

- name: Checkout libprojectM Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: projectM-visualizer/projectm
path: projectm
Expand All @@ -141,7 +141,7 @@ jobs:
cmake --install "${{ github.workspace }}/cmake-build-libprojectm" --config Release

- name: Checkout projectMSDL Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
path: frontend-sdl2
submodules: recursive
Expand All @@ -158,7 +158,7 @@ jobs:
cpack -G ZIP

- name: Upload Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: projectMSDL-buildcheck-windows
path: cmake-build-frontend-sdl2/*.zip
Expand All @@ -172,7 +172,7 @@ jobs:
run: brew install sdl2 ninja googletest poco

- name: Checkout libprojectM Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: projectM-visualizer/projectm
path: projectm
Expand All @@ -186,7 +186,7 @@ jobs:
cmake --install "${{ github.workspace }}/cmake-build-libprojectm"

- name: Checkout projectMSDL Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
path: frontend-sdl2
submodules: recursive
Expand All @@ -203,7 +203,7 @@ jobs:
cpack -G TGZ

- name: Upload Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: projectMSDL-buildcheck-macos
path: cmake-build-frontend-sdl2/*.tar.gz
64 changes: 50 additions & 14 deletions .github/workflows/release-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,39 @@ name: Build Release Package for Linux

on:
workflow_dispatch:
inputs:
projectMSDLref:
description: "projectMSDL Git reference (branch, tag or commit hash)"
required: true
default: "master"
type: string
projectMref:
description: "libprojectM Git reference (branch, tag or commit hash)"
required: true
default: "master"
type: string
pocoref:
description: "POCO Git reference (branch, tag or commit hash)"
required: true
default: "poco-1.14.1"
type: string
workflow_call:
inputs:
projectMSDLref:
description: "projectMSDL Git reference (branch, tag or commit hash)"
required: false
default: "master"
type: string
projectMref:
description: "libprojectM Git reference (branch, tag or commit hash)"
required: false
default: "master"
type: string
pocoref:
description: "POCO Git reference (branch, tag or commit hash)"
required: false
default: "poco-1.14.1"
type: string

jobs:
build-deb:
Expand All @@ -24,11 +56,11 @@ jobs:
# and other distros may ship different versions as well. POCO as a C++ library has no stable ABI, so each minor
# release increments the SO version by one.
- name: Checkout Poco Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: pocoproject/poco
path: poco
ref: 'poco-1.14.1'
ref: ${{ inputs.pocoref }}
submodules: recursive

- name: Build Poco
Expand All @@ -53,10 +85,11 @@ jobs:
cmake --install "${{ github.workspace }}/cmake-build-poco"

- name: Checkout libprojectM Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: projectM-visualizer/projectm
path: projectm
ref: ${{ inputs.projectMref }}
submodules: recursive

- name: Build/Install libprojectM
Expand All @@ -70,19 +103,20 @@ jobs:
cmake --install "${{ github.workspace }}/cmake-build-libprojectm"

- name: Checkout frontend-sdl2 Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
path: frontend-sdl2
ref: ${{ inputs.projectMSDLref }}
submodules: recursive

- name: Checkout Cream of the Crop preset pack
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: projectM-visualizer/presets-cream-of-the-crop
path: presets-cream-of-the-crop

- name: Checkout Milkdrop Texture Pack
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: projectM-visualizer/presets-milkdrop-texture-pack
path: presets-milkdrop-texture-pack
Expand All @@ -106,7 +140,7 @@ jobs:
cpack -G DEB

- name: Upload Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: projectMSDL-Linux-DEB-x86_64
path: cmake-build-frontend-sdl2/*.deb
Expand All @@ -126,11 +160,11 @@ jobs:
# and other distros may ship different versions as well. POCO as a C++ library has no stable ABI, so each minor
# release increments the SO version by one.
- name: Checkout Poco Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: pocoproject/poco
path: poco
ref: 'poco-1.14.1'
ref: ${{ inputs.pocoref }}
submodules: recursive

- name: Build Poco
Expand All @@ -155,10 +189,11 @@ jobs:
cmake --install "${{ github.workspace }}/cmake-build-poco"

- name: Checkout libprojectM Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: projectM-visualizer/projectm
path: projectm
ref: ${{ inputs.projectMref }}
submodules: recursive

- name: Build/Install libprojectM
Expand All @@ -172,19 +207,20 @@ jobs:
cmake --install "${{ github.workspace }}/cmake-build-libprojectm"

- name: Checkout frontend-sdl2 Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
path: frontend-sdl2
ref: ${{ inputs.projectMSDLref }}
submodules: recursive

- name: Checkout Cream of the Crop preset pack
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: projectM-visualizer/presets-cream-of-the-crop
path: presets-cream-of-the-crop

- name: Checkout Milkdrop Texture Pack
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: projectM-visualizer/presets-milkdrop-texture-pack
path: presets-milkdrop-texture-pack
Expand All @@ -209,7 +245,7 @@ jobs:
cpack -G TGZ

- name: Upload Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: projectMSDL-Linux-Portable-x86_64
path: cmake-build-frontend-sdl2/*.tar.gz
54 changes: 44 additions & 10 deletions .github/workflows/release-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,39 @@ name: Build Release Package for macOS

on:
workflow_dispatch:
inputs:
projectMSDLref:
description: "projectMSDL Git reference (branch, tag or commit hash)"
required: true
default: "master"
type: string
projectMref:
description: "libprojectM Git reference (branch, tag or commit hash)"
required: true
default: "master"
type: string
pocoref:
description: "POCO Git reference (branch, tag or commit hash)"
required: true
default: "poco-1.14.1"
type: string
workflow_call:
inputs:
projectMSDLref:
description: "projectMSDL Git reference (branch, tag or commit hash)"
required: false
default: "master"
type: string
projectMref:
description: "libprojectM Git reference (branch, tag or commit hash)"
required: false
default: "master"
type: string
pocoref:
description: "POCO Git reference (branch, tag or commit hash)"
required: false
default: "poco-1.14.1"
type: string
secrets:
MACOS_CERTIFICATE_APPLICATION:
required: true
Expand All @@ -29,7 +61,7 @@ jobs:
# We need to build third-party libraries (POCO, SDL2 and projectM) ourselves, as neither Homebrew
# nor vcpkg support building universal binaries.
- name: Checkout libSDL2 Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: libsdl-org/SDL
path: libsdl2
Expand All @@ -48,11 +80,11 @@ jobs:
cmake --install "${{ github.workspace }}/cmake-build-libsdl2"

- name: Checkout Poco Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: pocoproject/poco
path: poco
ref: 'poco-1.14.1'
ref: ${{ inputs.pocoref }}
submodules: recursive

- name: Build Poco
Expand Down Expand Up @@ -82,10 +114,11 @@ jobs:
cmake --install "${{ github.workspace }}/cmake-build-poco"

- name: Checkout libprojectM Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: projectM-visualizer/projectm
path: projectm
ref: ${{ inputs.projectMref }}
submodules: recursive

- name: Build/Install libprojectM
Expand All @@ -100,19 +133,20 @@ jobs:
cmake --install "${{ github.workspace }}/cmake-build-libprojectm"

- name: Checkout projectMSDL Sources
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
path: frontend-sdl2
ref: ${{ inputs.projectMSDLref }}
submodules: recursive

- name: Checkout Cream of the Crop preset pack
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: projectM-visualizer/presets-cream-of-the-crop
path: presets-cream-of-the-crop

- name: Checkout Milkdrop Texture Pack
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: projectM-visualizer/presets-milkdrop-texture-pack
path: presets-milkdrop-texture-pack
Expand Down Expand Up @@ -203,7 +237,7 @@ jobs:
xcrun stapler staple "${{ github.workspace }}/install/projectM.app"

- name: Upload .app Bundle Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: projectMSDL-macOS-Universal-APP
path: install/
Expand Down Expand Up @@ -253,7 +287,7 @@ jobs:
xcrun stapler staple "$PKG_FILE"

- name: Upload PKG Installer Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: projectMSDL-macOS-Universal-PKG
path: projectM-*.pkg
Expand Down Expand Up @@ -297,7 +331,7 @@ jobs:
xcrun stapler staple "$DMG_FILE"

- name: Upload DMG Installer Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: projectMSDL-macOS-Universal-DMG
path: projectM-*.dmg
Expand Down
Loading
Loading