Skip to content

Commit

Permalink
Merge pull request #260 from MediaPortal/MP1.33_Pre.Release_Test8
Browse files Browse the repository at this point in the history
MP1-1.33 Pre: Release
  • Loading branch information
andrewjswan authored Feb 1, 2024
2 parents 5021437 + 1773374 commit 59a6144
Show file tree
Hide file tree
Showing 280 changed files with 16,186 additions and 6,584 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @Azzuro @andrewjswan @doskabouter @epbk @Sebastiii
12 changes: 12 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
critical:
- '(Critical|critical|Urgent|urgent)'
enhancement:
- '(Enhancement|enhancement)'
Engine:
- '(Core|core)'
TV:
- '(TV|TVE)'
Tuning:
- '(Tuning|tuning)'
MPE:
- 'MPE'
19 changes: 16 additions & 3 deletions .github/workflows/mediaportal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,20 @@ on:
- master
# Ignore all Tags / Release
tags-ignore:
- '**'
- '**'

workflow_call:
inputs:
retention-logs:
description: "Retention Period for Log files. Default is 1"
default: 3
required: false
type: number
retention-build:
description: "Retention Period for Setup files. Default is 90"
default: 90
required: false
type: number

jobs:
build:
Expand Down Expand Up @@ -40,7 +52,7 @@ jobs:

- name: Setup NSIS
run: |
choco install --yes nsis --version=3.08 --force
choco install --yes nsis --version=3.09 --force
- name: Git Checkout
uses: actions/checkout@v4
Expand All @@ -62,7 +74,7 @@ jobs:
name: Build result file ${{ matrix.architecture }}
path: |
${{ github.workspace }}\Build\BuildFullInstaller.log
retention-days: 3
retention-days: ${{ inputs.retention-logs || 3 }}

- name: Upload Artifact / Mediaportal setup file
uses: actions/upload-artifact@v4
Expand All @@ -71,4 +83,5 @@ jobs:
name: Mediaportal setup file ${{ matrix.architecture }}
path: |
${{ github.workspace }}\Release\MediaPortalSetup_*.exe
retention-days: ${{ inputs.retention-build || 90 }}
if-no-files-found: error
89 changes: 29 additions & 60 deletions .github/workflows/mediaportal_jira.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,68 +8,37 @@ on:
# Ignore all Tags / Release
tags-ignore:
- '**'

workflow_call:
inputs:
retention-logs:
description: "Retention Period for Log files. Default is 1"
default: 3
required: false
type: number
retention-build:
description: "Retention Period for Setup files. Default is 90"
default: 3
required: false
type: number

jobs:
build:
strategy:
matrix:
architecture: [x86, x64]

name: Build Mediaportal

runs-on: windows-2019

uses: ./.github/workflows/mediaportal.yml
with:
retention-logs: ${{ inputs.retention-logs || 3 }}
retention-build: ${{ inputs.retention-build || 3 }}

ci-status:
name: Status
runs-on: ubuntu-latest
needs:
- build
if: always()
steps:
- name: Setup Visual Studio 2019
uses: microsoft/[email protected]
with:
vs-version: 16.11

- name: Link to Visual Studio 2019 Community
run: |
mklink /J "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community" "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise"
shell: cmd

- name: Setup Java JDK
uses: actions/setup-java@v4
with:
java-version: 8
architecture: x86
distribution: temurin

- name: Setup NSIS
run: |
choco install --yes nsis --version=3.08 --force
- name: Git Checkout
uses: actions/checkout@v4

- name: Git Submodule Update
run: |
git submodule update --init --recursive
- name: Build
run: |
BuildFullinstaller.cmd LOG ${{ matrix.architecture }}
working-directory: ${{ github.workspace }}\Build
shell: cmd

- name: Upload Artifact / Build result file
uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: Build result file ${{ matrix.architecture }}
path: |
${{ github.workspace }}\Build\BuildFullInstaller.log
retention-days: 3

- name: Upload Artifact / Mediaportal setup file
uses: actions/upload-artifact@v4
if: ${{ success() }}
with:
name: Mediaportal setup file ${{ matrix.architecture }}
path: |
${{ github.workspace }}\Release\MediaPortalSetup_*.exe
if-no-files-found: error
retention-days: 3
- name: Success
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Failure
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1
91 changes: 30 additions & 61 deletions .github/workflows/mediaportal_test_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,69 +7,38 @@ on:
- 'MP1.**_Test**'
# Ignore all Tags / Release
tags-ignore:
- '**'
- '**'

workflow_call:
inputs:
retention-logs:
description: "Retention Period for Log files. Default is 1"
default: 3
required: false
type: number
retention-build:
description: "Retention Period for Setup files. Default is 90"
default: 7
required: false
type: number

jobs:
build:
strategy:
matrix:
architecture: [x86, x64]

name: Build Mediaportal

runs-on: windows-2019

uses: ./.github/workflows/mediaportal.yml
with:
retention-logs: ${{ inputs.retention-logs || 3 }}
retention-build: ${{ inputs.retention-build || 7 }}

ci-status:
name: Status
runs-on: ubuntu-latest
needs:
- build
if: always()
steps:
- name: Setup Visual Studio 2019
uses: microsoft/[email protected]
with:
vs-version: 16.11

- name: Link to Visual Studio 2019 Community
run: |
mklink /J "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community" "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise"
shell: cmd

- name: Setup Java JDK
uses: actions/setup-java@v4
with:
java-version: 8
architecture: x86
distribution: temurin

- name: Setup NSIS
run: |
choco install --yes nsis --version=3.08 --force
- name: Git Checkout
uses: actions/checkout@v4

- name: Git Submodule Update
run: |
git submodule update --init --recursive
- name: Build
run: |
BuildFullinstaller.cmd LOG ${{ matrix.architecture }}
working-directory: ${{ github.workspace }}\Build
shell: cmd

- name: Upload Artifact / Build result file
uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: Build result file ${{ matrix.architecture }}
path: |
${{ github.workspace }}\Build\BuildFullInstaller.log
retention-days: 3

- name: Upload Artifact / Mediaportal setup file
uses: actions/upload-artifact@v4
if: ${{ success() }}
with:
name: Mediaportal setup file ${{ matrix.architecture }}
path: |
${{ github.workspace }}\Release\MediaPortalSetup_*.exe
if-no-files-found: error
retention-days: 7
- name: Success
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Failure
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1
2 changes: 1 addition & 1 deletion .github/workflows/workflow_codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- name: Setup NSIS
run: |
choco install --yes nsis --version=3.08 --force
choco install --yes nsis --version=3.09 --force
- name: Git Checkout
uses: actions/checkout@v4
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/workflow_labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: "Workflow / Pull Request Labeler"

on:
pull_request:
types: [opened, edited]

jobs:
labeler:
name: Add labels to Pull Request

runs-on: ubuntu-latest

steps:
- name: Add labels to Pull Request
uses: github/[email protected]
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/labeler.yml
enable-versioned-regex: 0
include-title: 1
24 changes: 24 additions & 0 deletions .github/workflows/workflow_milestone.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: "Workflow / Milestone"

on:
pull_request:
types:
- opened
- closed

jobs:
add_on_open:
name: Add Milestone on Open
if: github.event.action == 'opened'
runs-on: ubuntu-latest
steps:
- uses: benelan/milestone-action@v2

add_on_close:
name: Add Milestone on Close / Merge
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
steps:
- uses: benelan/milestone-action@v2
with:
overwrite: true # remove this line to keep existing milestone
6 changes: 3 additions & 3 deletions Common-MP-TVE3/Common.Utils/Common.Utils.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
Expand All @@ -86,7 +86,7 @@
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType />
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public int GetHashCode(UsesSubsystemAttribute obj)

private static readonly HashSet<Assembly> AppAssemblies = new HashSet<Assembly>();
private static readonly Dictionary<string, Version> SubSystemVersions = new Dictionary<string, Version>();
private static readonly Version AppVersion;
public static readonly Version AppVersion;
public static readonly Version SkinVersion = new Version(1, 4, 0, 0);
private static readonly string MinRequiredVersionDefault = "1.1.8.0"; // 1.2.0 RC1

Expand Down
6 changes: 3 additions & 3 deletions Common-MP-TVE3/DirectShowLib/DirectShowLib.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;ALLOW_UNTESTED_STRUCTS;ALLOW_UNTESTED_INTERFACES</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
Expand All @@ -99,7 +99,7 @@
<BaseAddress>285212672</BaseAddress>
<Optimize>true</Optimize>
<DebugType />
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
Expand All @@ -74,7 +74,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
Expand Down
Loading

0 comments on commit 59a6144

Please sign in to comment.